Changeset 5472 for extensions/pLoader/trunk/src/Uploader/ImageList.pm

Timestamp:

Mar 30, 2010, 2:29:37 PM (14 years ago)

Author:

ronosman

Message:

Feature 1554 added : use caption as prefix.

File:

• extensions/pLoader/trunk/src/Uploader/ImageList.pm (modified) (7 diffs)

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

@@ -68 +68 @@
                 progress_msg
                 last_error_msg
-                default_photo_name
-                default_photo_name_method
-                default_name_prefix
+                default_caption
+                default_caption_pattern
                 SetNewFilesViewerRefreshCallback
                 SetNewFilesProgressCallback
@@ -320 +319 @@
                 file              => $file->{ANSIPathName},
                 file_sum          => $sum,
-                site_name         => $self->_default_photo_name($file->{PathName}, $info, $i),
+                site_name         => $self->init_default_caption($file->{PathName}, $info, $i),
+                caption           => $self->default_caption,
                 site_author       => $self->author,
                 exif_metadata     => $self->_select_exif_data($info),
@@ -342 +342 @@
 }
 
-sub GetCurrentImageDefaultName {
-    my ( $self, $index, $pattern ) = @_;
-
-    $pattern = wxTheApp->eng_default_photo_names->{$pattern};
-
-    $self->SetCurrentImage($index);
-
-    my $img = $self->current_image;
-
-    $self->_photo_name_from_pattern(
-        $img->file,
-        $img->create_date,
-        $index,
-        $pattern
-    );
-}
-
-sub _default_photo_name {
+
+sub init_default_caption {
     my ( $self, $file, $info, $i ) = @_;
 
     my $create_date = $info->{CreateDate};
-    
-    
-    $self->_photo_name_from_pattern($file, $create_date, $i, $self->default_photo_name);
-}
-
-
-sub _photo_name_from_pattern {
-    my ( $self, $file, $create_date, $i, $pattern ) = @_;
+
+    $self->init_caption_from_pattern(
+        $file,
+        $create_date,
+        $i,
+        $self->default_caption,
+        $self->default_caption_pattern
+    );
+}
+
+
+sub init_caption_from_pattern {
+    my ( $self, $file, $create_date, $i, $caption, $pattern ) = @_;
 
     my ( $yyyy, $mm, $dd, $hh, $mi, $ss ) = split /[:\s]/, $create_date ;
@@ -376 +365 @@
     my $chrono = join('', $yyyy, $mm, $dd);
 
-    my $name;
+    my $caption_from_pattern;
     my $ext;
     my ( $vol, $path, $filename ) = File::Spec->splitpath($file);
@@ -382 +371 @@
     
 
-    if('Prefix' eq $pattern){
-        $name = $self->default_name_prefix
+    if('Caption' eq $pattern){
+        $caption_from_pattern = $caption
     }
     elsif('File name' eq $pattern){
-        $name = $filename
+        $caption_from_pattern = $filename
     }
     elsif('File path and name' eq $pattern){
-        $name = sprintf(
+        $caption_from_pattern = sprintf(
             "%s", 
             File::Spec->catfile($path, $filename), 
         )        
     }    
-    elsif('Prefix + rank number' eq $pattern){
-        $name = sprintf(
-            "%s%s", 
-            $self->default_name_prefix, 
+    elsif('Caption + rank number' eq $pattern){
+        $caption_from_pattern = sprintf(
+            "%s %s", 
+            $caption, 
             1+$i,
         )        
     }    
-    elsif('Rank number + prefix' eq $pattern){
-        $name = sprintf(
-            "%s%s", 
+    elsif('Rank number + caption' eq $pattern){
+        $caption_from_pattern = sprintf(
+            "%s %s", 
             1+$i,
-            $self->default_name_prefix, 
+            $caption, 
         )        
     }    
-    elsif('Prefix + create date chrono' eq $pattern){
-        $name = sprintf(
-            "%s%s", 
-            $self->default_name_prefix, 
+    elsif('Caption + create date chrono' eq $pattern){
+        $caption_from_pattern = sprintf(
+            "%s %s", 
+            $caption, 
             $chrono,
         )        
     }    
-    elsif('Create date chrono + prefix' eq $pattern){
-        $name = sprintf(
-            "%s%s", 
+    elsif('Create date chrono + caption' eq $pattern){
+        $caption_from_pattern = sprintf(
+            "%s %s", 
             $chrono,
-            $self->default_name_prefix, 
+            $caption, 
         )        
     }
-
-    $name;
+    elsif('Create date chrono + rank' eq $pattern){
+        $caption_from_pattern = sprintf(
+            "%s %s", 
+            $chrono,
+            1+$i, 
+        )        
+    }
+    elsif('Rank + create date chrono' eq $pattern){
+        $caption_from_pattern = sprintf(
+            "%s %s", 
+            1+$i, 
+            $chrono,
+        )        
+    }
+
+    $caption_from_pattern;
+}
+
+
+sub GetCurrentImageCaption {
+    my ( $self, $index, $pattern ) = @_;
+
+    $pattern = wxTheApp->eng_caption_patterns->{$pattern};
+
+    $self->SetCurrentImage($index);
+
+    my $img = $self->current_image;
+
+    $self->init_caption_from_pattern(
+        $img->file,
+        $img->create_date,
+        $index,
+        $self->current_image->caption,
+        $pattern
+    );
 }
 
@@ -742 +764 @@
                 userdata_dir
                 progress_msg
-                default_photo_name
-                default_name_prefix
+                default_caption
+                default_caption_pattern
                 upload_high
                 upload_hd
@@ -1504 +1526 @@
             else{
                 $_name = $name;
-                $self->default_name_prefix($name);
+                $self->GetImage($_)->caption(
+                    $_name
+                ) ;
             }
+
             $self->image_selection_name($_name);
-
             $self->GetImage($_)->site_name(
                 $_name