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

Timestamp:

Dec 10, 2009, 3:21:06 PM (14 years ago)

Author:

ronosman

Message:

Feature 1052 added : photo re-upload management. When uploading an already added photo, the user is warned and has a choice on action for files, simple properties and multi-values properties.

File:

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

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

@@ -95 +95 @@
                 use_exif_preview
                 image_sums
+                                upload_image_sums
                 sums
                 version
@@ -120 +121 @@
                 upload_file
                 upload_name
+                                ReuploadCallback
+                                reupload_action_files
+                                reupload_action_properties
+                                reupload_action_properties_m
+                                reupload_not_ask
      /
 );
@@ -253 +259 @@
             # ok
             if(!$@){
-                $self->progress_msg("Selection thumbnail created for %s");
+                $self->progress_msg(gettext("Selection thumbnail created for %s"));
             }
             else {
@@ -554 +560 @@
     
     my $rval = 1 ;
-    return $rval if( -e $self->current_image->site_resized_file );
+    #return $rval if( -e $self->current_image->site_resized_file );
 
     printf(
@@ -634 +640 @@
     my ( $self ) = @_;
     
-    return 1 if( -e $self->current_image->site_thumb_file );
+    #return 1 if( -e $self->current_image->site_thumb_file );
     
     my $rval = 1;
@@ -765 +771 @@
                 watermark_x
                 watermark_color
+                                reupload_action_files
+                                reupload_action_properties
+                                reupload_action_properties_m
             /
         ] 
@@ -797 +806 @@
     $self->upload_begin_time(time);
     $self->upload_selection_count(scalar @{$self->image_selection});
+        # for re-upload management
+    $self->upload_image_sums( [
+                map { $self->GetImage($_)->file_sum }
+                    @{$self->image_selection}
+            ] 
+        );
+
+        # check if already exist on server
+        my $uploaded = $self->pwg->IsAlreadyUploaded($self->upload_image_sums);
+        my @already_uploaded = grep { $_ } values %$uploaded ; 
+        $self->ReuploadCallback->() if ( scalar @already_uploaded and !$self->reupload_not_ask );
+
+        
     foreach(@{$self->image_selection}) {
-        # current image object          
+        # current image object          
         $self->current_image(
             $self->GetImage($_)
-        );
+        ); 
         # prepare resized, high, thumbnail
-        $self->_upload_selection_prepare();
+                # if not already uploaded
+        $self->_set_site_resized_file();
+        $self-> _set_site_high_file ();
+        # photo metadata
+        $self->_prepare_upload_properties();            
+        $self->_upload_selection_prepare() if (!$uploaded->{$self->current_image->file_sum} or $self->reupload_action_files);
 
         # transfert resized, high, thumbnail to site
@@ -827 +854 @@
     $self->progress_thumbnail_refresh->();
     # PREPARE
-    $self->_set_site_resized_file();
     $self->_set_upload_msg(gettext("Preparing resized image for"));
     $self->_upload_progress();
@@ -848 +874 @@
             'Yes, use a copy of the original photo' => 'ORIGINAL',
     };  
-
+printf("upload HD %s\n", $self->upload_hd);
         $self->upload_high(
             $decode->{$self->upload_hd}
@@ -866 +892 @@
     $self->_upload_progress();
 
-    # photo metadata
-    $self->_prepare_upload_properties();        
 
 }
@@ -923 +947 @@
             highdef_msg=>gettext("Uploading high definition"),
             checksum_msg=>gettext("Checksum for"),
+            original_sum=>$self->current_image->file_sum,
         } 
     );
@@ -1102 +1127 @@
 
     if($bModifyOriginal){
-        $self-> _set_site_high_file ();
 
         my $image = Image::Magick->new();
@@ -1238 +1262 @@
 sub _prepare_upload_properties {
     my ( $self ) = @_;
+
+        $self->pwg->reupload_action_files(
+            $self->reupload_action_files||1
+        );
+        $self->pwg->reupload_action_properties(
+            $self->reupload_action_properties||2
+        );
+
+        $self->pwg->reupload_action_properties_m(
+            $self->reupload_action_properties_m||1
+        );
     
     $self->pwg->upload_high(
@@ -1285 +1320 @@
         join(',', @{$self->current_image->site_tags})
     );
+
         
 }