Changeset 4764

Timestamp:

Jan 27, 2010, 5:32:12 PM (14 years ago)

Author:

ronosman

Message:

Bug 1410 fixed : pLoader may crash when adding or uploading photo is canceled by user.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/Frame.pm (modified) (2 diffs)
• GUI/wxImageProcessingProgressDlg.pm (modified) (4 diffs)
• GUI/wxImageReuploadDlg.pm (modified) (2 diffs)
• ImageList.pm (modified) (9 diffs)
• PWG/WebServices.pm (modified) (2 diffs)

extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

@@ -1301 +1301 @@
                 title => gettext("Image processing progress information"),
                 bt_label => gettext("Cancel image processing"), 
-                bt_close_label => gettext("Close"), 
+                bt_close_label => gettext("Close"),
+                stop_processing => sub { $self->imagelist->stop_processing(1); Wx::Yield(); },
              }
         )        
@@ -1752 +1753 @@
                     bt_label => gettext("Cancel upload"),
                     bt_close_label => gettext("Close"), 
+                    stop_processing => sub { $self->imagelist->stop_processing(1); Wx::Yield(); }, 
                  }
             )        

extensions/pLoader/trunk/src/Uploader/GUI/wxImageProcessingProgressDlg.pm

@@ -52 +52 @@
            cancelled
            bt_close_label
+           stop_processing
       / 
 );
@@ -70 +71 @@
              wxDIALOG_NO_PARENT|
              wxDEFAULT_DIALOG_STYLE|
-
              wxMAXIMIZE_BOX|
-             wxMINIMIZE_BOX| 
+             wxMINIMIZE_BOX|
              wxSTAY_ON_TOP
 
@@ -95 +95 @@
     $self->bt_close_label(
         $params->{bt_close_label}||'Close'
+    );
+
+    $self->stop_processing(
+        $params->{stop_processing}
     );
 
@@ -149 +153 @@
     
     $self->cancelled(1);
+    $self->stop_processing->();
     $self->Destroy;
  

extensions/pLoader/trunk/src/Uploader/GUI/wxImageReuploadDlg.pm

@@ -25 +25 @@
              wxID_CANCEL
              wxID_OK
-             wxGREEN
              wxSTAY_ON_TOP
          /;
@@ -31 +30 @@
 use base qw/Wx::Dialog Uploader::GUI::DlgCommon/;
 use Wx::Event qw/
-                    EVT_UPDATE_UI
                     EVT_BUTTON
                     EVT_CLOSE

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

@@ -126 +126 @@
                 reupload_not_ask
                 display_mode
+                stop_processing
      /
 );
@@ -218 +219 @@
     my ( $self, $files ) = @_;
 
+    $self->stop_processing(0);
+
     $self->new_files( $files );
 
@@ -227 +230 @@
     my $errors = 0;
 
-    map {
-        my $info = $self->_read_exif_metatdata($_->{ANSIPathName});
-           my $is_new_image = $self->_add_image($_, $info, $i);    
+    foreach my $file ( @{$files} ) {
+        my $info = $self->_read_exif_metatdata($file->{ANSIPathName});
+           my $is_new_image = $self->_add_image($file, $info, $i);    
         $self->SetCurrentImage($i);
         $self->_set_current_image_filepaths();
@@ -254 +257 @@
         $self->count($count);
         $self->SetNewFilesViewerRefreshCallback->();
-    }
-    @{$files};
+        last if $self->stop_processing;
+    }
+
     $self->SetNewFilesDisplayEndInfoCallback->(
         sprintf(
@@ -741 +745 @@
 
 sub UploadSelection {
-    my ( $self ) = @_;    
+    my ( $self ) = @_;
+
+    $self->stop_processing(0);
 
     my $viewer_callback = $self->UploadImagesViewerCallback ;
@@ -795 +801 @@
         # keep site_high_file because it can be the original !!!
         $self->_remove_resized_from_cache;
-    }
+
+        last if $self->stop_processing;
+    }
+
+    $self->stop_processing(0);
 
     if($self->remove_uploaded_from_selection){
         $self->_remove_image_list($self->uploaded_images);
+        # clear thumbnail imagelistctrl
         $viewer_callback->();
     }
 
     $self->_upload_selection_final_log();
+
 }
 
@@ -881 +893 @@
             $self->upload_msg
         );
-        # set current image thumbnail
-          # update upload progress dialog
-        #$self->progressbar_refresh->($value);
     };
     # user cancelled : dialog box is destroyed
@@ -912 +921 @@
     my ( $self ) = @_;
 
+    return if $self->stop_processing;
+
     $self->_set_upload_msg(gettext("Uploading"));
     $self->_upload_progress(0);
@@ -918 +929 @@
     my ( $status, $status_msg, $content ) = $self->pwg->UploadImage(
         { 
-            yield=>$self->YieldCallback, 
-            bar=>$self->progressbar_refresh, 
-            msg=>$self->progress_msg_refresh,
-            msg_details=>$self->progress_msg_details_refresh,
-            resized_msg=>gettext("Uploading resized"),
-            thumbnail_msg=>gettext("Uploading thumbnail"),
-            highdef_msg=>gettext("Uploading high definition"),
-            checksum_msg=>gettext("Checksum for"),
-            original_sum=>$self->current_image->file_sum,
+            yield           => $self->YieldCallback, 
+            bar             => $self->progressbar_refresh, 
+            msg             => $self->progress_msg_refresh,
+            msg_details     => $self->progress_msg_details_refresh,
+            resized_msg     => gettext("Uploading resized"),
+            thumbnail_msg   => gettext("Uploading thumbnail"),
+            highdef_msg     => gettext("Uploading high definition"),
+            checksum_msg    => gettext("Checksum for"),
+            original_sum    => $self->current_image->file_sum,
+            stop_processing => $self->stop_processing,
         } 
     );

extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm

@@ -271 +271 @@
 sub UploadImage {
     my ( $self, $progress ) = @_;
+    
+    return if $progress->{stop_processing};
 
     $self->image_id(
@@ -382 +384 @@
         level         => $self->privacy_level ? 2**($self->privacy_level - 1) : 0,
     };
-    print Dumper $form;
+
     my ( $status, $status_line ) = $self->_execute_post($form); 
     my $hresult = $self->_json_response_content;