Changeset 4757 for extensions/pLoader

Timestamp:

Jan 26, 2010, 7:50:43 PM (14 years ago)

Author:

ronosman

Message:

Bug 1403 fixed : re-upload choice may be overridden by default values.

File:

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

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

@@ -430 +430 @@
 }
 
-sub RemoveImage {
-    my ( $self, $index ) = @_;
-
-    return if (! defined $self->image_selection );
-    return if (! defined $index );
-        
-    $self->DeleteImage($index);
-    splice @{$self->sums}, $index, 1 ;
-    $self->wx_thumb_imglist->Remove($index);
-    
-}
 
 # used for display in GUI. has to fit a square box ( wxImageList )
@@ -809 +798 @@
             1+$self->count
         );
-        # remove thumbnail, resized, HD files
+        # remove thumbnail, resized
         # to make sure everything is clean
-        map{
-            unlink $self->current_image->$_ if -e $self->current_image->$_;
-        }
-        qw/ site_resized_file site_high_file site_thumb_file/;
+        # keep site_high_file because it can be the original !!!
+        $self->_remove_resized_from_cache;
     }
 
@@ -823 +810 @@
 
     $self->_upload_selection_final_log();
+}
+
+
+sub _remove_resized_from_cache {
+    my ( $self ) = @_;
+
+    unlink $self->current_image->site_thumb_file if -e $self->current_image->site_thumb_file;
+
+    map {
+        my $file = File::Spec->catfile(
+            $self->site_resized_dir,
+            sprintf(
+                "%s.%s",
+                 $_,
+                $self->type,
+            )
+        );
+        unlink $file if -e $file;
+    } qw /resized high/;
+
+
 }
 
@@ -1017 +1025 @@
             $self->site_resized_dir,
             sprintf(
-                "%s_%sx%s.%s",
-#                $filename,
+                "%s.%s",
                 'resized',
-                $self->resize_w,
-                $self->resize_h,
                 $self->type,
             )
@@ -1195 +1200 @@
                 sprintf(
                     "%s.%s",
-                     'high_file',
+                     'high',
                     $self->type,
                 )
@@ -1244 +1249 @@
     my ( $self ) = @_;
 
-    
+    # set default values only if not defined
+    # || operator is not used because 0 is a choice value
+    $self->reupload_action_files(1) 
+        unless defined $self->reupload_action_files;
+
+    $self->pwg->reupload_action_properties(1)
+        unless defined $self->pwg->reupload_action_properties;
+
+    $self->pwg->reupload_action_properties_m(1)
+        unless defined $self->pwg->reupload_action_properties_m;
+
     $self->pwg->reupload_action_files(
-        $self->reupload_action_files||1
+        $self->reupload_action_files
     );
     $self->pwg->reupload_action_properties(
-        $self->reupload_action_properties||2
+        $self->reupload_action_properties
     );
 
     $self->pwg->reupload_action_properties_m(
-        $self->reupload_action_properties_m||1
+        $self->reupload_action_properties_m
     );