Changeset 3267 for extras/pLoader/trunk/src/Uploader/ImageList.pm

Timestamp:

May 5, 2009, 8:14:43 PM (15 years ago)

Author:

ronosman

Message:

Feature 987 added: use filename or prefix to create a default photo name.

File:

• extras/pLoader/trunk/src/Uploader/ImageList.pm (modified) (6 diffs)

extras/pLoader/trunk/src/Uploader/ImageList.pm

@@ -30 +30 @@
 use Digest::MD5::File qw/file_md5_hex md5_hex/;
 use Encode qw/encode decode is_utf8/;
+use Wx::Locale qw/:default/;
 
 # this class implements a collection of image files with associated data
@@ -62 +63 @@
                 progress_msg
                 last_error_msg
+                default_photo_name
+                default_photo_name_method
                 default_name_prefix
                 SetNewFilesViewerRefreshCallback
@@ -91 +94 @@
 
 sub Init {
-    my ( $self ) = @_;  
+    my ( $self ) = @_;
+    
+    
 }
 
@@ -310 +315 @@
     my $image;
     if ( !exists $self->image_sums->{$sum} ){
+print "_add_image ", $file, "\n";
         # append to image list
         $image = Uploader::Image->new(
         {
-                file              => $_,
+                file              => $file,
                 file_sum          => $sum,
-                site_name         => sprintf(
-                                         "%s %s", 
-                                         $self->default_name_prefix, 
-                                         $i,
-                                     ),
+                site_name         => $self->_default_photo_name($file, $info, $i),
                 site_author       => $self->author,
                 exif_metadata     => $self->_select_exif_data($info),
@@ -336 +338 @@
 
         
-    #$self->images->[$i] = $image ;
     $self->sums->[$i] = $sum ;
 
     $is_new_image;
+}
+
+
+sub _default_photo_name {
+    my ( $self, $file, $info, $i ) = @_;
+    
+    my $name;
+    my $create_date = $info->{CreateDate};
+    my $ext;
+    my ( $vol, $path, $filename ) = File::Spec->splitpath($file);
+    ( $filename, $ext ) = split /\.\w+$/, $filename;
+    
+    my ( $yyyy, $mm, $dd, $hh, $mi, $ss ) = split /[:\s]/, $create_date ;
+  
+    my $chrono = join('', $yyyy, $mm, $dd);
+    if(gettext('Prefix') eq $self->default_photo_name){
+        $name = $self->default_name_prefix
+    }
+    elsif(gettext('File name') eq $self->default_photo_name){
+        $name = $filename
+    }
+    elsif(gettext('File path and name') eq $self->default_photo_name){
+        $name = sprintf(
+            "%s", 
+            File::Spec->catfile($path, $filename), 
+        )       
+    }   
+    elsif(gettext('Prefix + rank number') eq $self->default_photo_name){
+        $name = sprintf(
+            "%s%s", 
+            $self->default_name_prefix, 
+            1+$i,
+        )       
+    }   
+    elsif(gettext('Rank number + prefix') eq $self->default_photo_name){
+        $name = sprintf(
+            "%s%s", 
+            1+$i,
+            $self->default_name_prefix, 
+        )       
+    }   
+    elsif(gettext('Prefix + create date chrono') eq $self->default_photo_name){
+        $name = sprintf(
+            "%s%s", 
+            $self->default_name_prefix, 
+            $chrono,
+        )       
+    }   
+    elsif(gettext('Create date chrono + prefix') eq $self->default_photo_name){
+        $name = sprintf(
+            "%s%s", 
+            $chrono,
+            $self->default_name_prefix, 
+        )       
+    }   
+
+    $name;      
 }
 
@@ -764 +822 @@
                 userdata_dir
                 progress_msg
+                default_photo_name
                 default_name_prefix
                 upload_high