Changeset 6707 for extensions/pLoader/trunk/src/Uploader/TransferWorker.pm

Timestamp:

Jul 26, 2010, 11:21:44 AM (14 years ago)

Author:

ronosman

Message:

use tranfer error messages in progress list. various bug fixes.

File:

• extensions/pLoader/trunk/src/Uploader/TransferWorker.pm (modified) (13 diffs)

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

@@ -34 +34 @@
     return unless $image->{image_id};
 
-    $self->log_image_progress(
-        $image,
-        "cancelled",
-        0,
-    );
+    ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"cancelled"}, 0);
+    $self->post_image_progress_event($image);
 }
 
@@ -49 +46 @@
     );
 
-
     $self->progress_event(
         $progress_event
@@ -57 +53 @@
         $transfer_done_event
     );
-
+    
 
     if(!$self->exists_image($image)){
@@ -66 +62 @@
     }
 
+    $self->post_image_done_event($image);
 }
 
@@ -81 +78 @@
     my ( $self, $image ) = @_;
 
-    $self->log_image_progress($image, "sending files", 0);
+    ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"sending files"}, 0);
+    $self->post_image_progress_event($image);
+
     $self->add_image_files($image);
     $self->add_image($image);
-    $self->log_image_progress($image, "transfered", 100);
-
-}
-
-
-sub log_image_progress {
-    my ( $self, $image, $status, $value ) = @_;
-
-    $image->{status}   = $status;
-    $image->{progress} = $value;
+
     $self->post_image_progress_event($image);
 }
@@ -110 +100 @@
 
 
-    $self->log_image_progress($image, "check files", 0);
+    ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"checking files"}, 0);
+    $self->post_image_progress_event($image);
+
     my @file_types = ('site_resized_file', 'site_thumb_file');
     push @file_types, 'site_high_file' if $image->{upload_high};
@@ -118 +110 @@
     }@file_types;
 
-    $self->log_image_progress($image, "files checked", 100);
+    ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"files checked"}, 100);
+    $self->post_image_progress_event($image);
 }
 
@@ -157 +150 @@
     my ( $self, $image ) = @_;
 
-    $self->pwg->add_image($image);
+    my ( $is_success, $status_line ) = $self->pwg->add_image($image);
+    
+    $image->{transfer_successful} = $is_success;
+    $image->{status} = $is_success ? $self->localized_msg->{"transfered"} : $status_line ;
 }
 
@@ -164 +160 @@
     my ( $self, $image ) = @_;
 
-    $self->log_image_progress($image, "updating", 0);
+    
+    ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"updating"}, 0);
+    $self->post_image_progress_event($image);
 
     $self->update_image_files($image);
+    $self->post_image_progress_event($image);
+
     $self->update_image_properties($image);
-
-    $self->log_image_progress($image, "updated", 100);
+    $self->post_image_progress_event($image);
 }
 
@@ -177 +176 @@
 
     if($image->{preferences}{reupload_action_files}){
-        $self->log_image_progress($image, "updating files", 0);
+        ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"updating files"}, 0);
+        $self->post_image_progress_event($image);
+
         $self->init_image_files_checksums($image);
         $self->update_image_modified_files($image);
-        $self->log_image_progress($image, "files updated", 100);
     }
 }
@@ -188 +188 @@
     my ( $self, $image ) = @_;
 
-    $self->pwg->update_image_modified_files($image);
+    my ( $is_success, $status_line ) = $self->pwg->update_image_modified_files($image);
+    $image->{transfer_successful} = $is_success;
+    $image->{status} = $is_success ? $self->localized_msg->{"files updated"} : $status_line ;
 }
 
@@ -195 +197 @@
     my ( $self, $image ) = @_;
 
-    $self->log_image_progress($image, "updating properties", 0);
-    $self->pwg->update_image_properties($image);
-    $self->log_image_progress($image, "properties updated", 100);
+    ( $image->{status}, $image->{progress} ) = ($self->localized_msg->{"updating properties"}, 0);
+    $self->post_image_progress_event($image);
+
+    my ( $is_success, $status_line ) = $self->pwg->update_image_properties($image);
+
+    $image->{transfer_successful} = $is_success;
+    $image->{status} = $is_success ? $self->localized_msg->{"properties updated"} : $status_line ;
+}
+
+
+sub post_image_done_event {
+    my ( $self, $image ) = @_;
+
+    $image->{progress} = 100;
+
+    $self->post_image_event(
+        $self->done_event,
+        $image
+    );
 }
 
@@ -219 +237 @@
         shared_clone($image)
     );
-    Wx::PostEvent($self->event_handler, $thread_event);
+
+    eval {
+        Wx::PostEvent($self->event_handler, $thread_event);
+    }
 }