Changeset 3509 for extensions/pLoader

Timestamp:

Jul 4, 2009, 12:09:47 AM (15 years ago)

Author:

ronosman

Message:

Bug 1030 fixed : catch communication error with Piwigo site. The Piwigo method return status is checked after checking HTTP response status.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/wxApp.pm (modified) (2 diffs)
• ImageList.pm (modified) (8 diffs)
• PWG/WebServices.pm (modified) (11 diffs)

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

@@ -331 +331 @@
     
     $self->version(
-        '2.0.2c'
+        '2.0.2d'
     );
     
@@ -554 +554 @@
     $self->imagelist->ResizeCallback(
         sub { $self->ResizeImage(@_) }
+    );
+
+    $self->imagelist->YieldCallback(
+        sub { Wx::Yield }
     );
 }

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

@@ -31 +31 @@
 use Encode qw/encode decode is_utf8/;
 use Wx::Locale qw/:default/;
+use Wx;
 
 # this class implements a collection of image files with associated data
@@ -69 +70 @@
                 SetNewFilesProgressCallback
                 SetNewFilesDisplayEndInfoCallback
+                YieldCallback
                 UploadImagesViewerCallback
                 progress_thumbnail_refresh
@@ -883 +885 @@
     
             # update upload progress dialog
-            $self->progressbar_refresh->(0.20);
+            $self->progressbar_refresh->(0.05);
         };
         # user cancelled : dialog box is destroyed
@@ -929 +931 @@
         }
 
+        # Resized and original are ready
+        $self->progressbar_refresh->(0.10);
+
+
         $msg = sprintf(
             "Preparing thumbnail for %s - %s",
@@ -960 +966 @@
         eval {
             $self->progress_msg_refresh->($msg);
-            $self->progressbar_refresh->(0.50);
+            # Thumbnail is ready
+            $self->progressbar_refresh->(0.20);
         };
         croak "Upload cancelled. ", $@ if $@ ;
@@ -966 +973 @@
         # photo metadata
         $self->_prepare_upload_properties();            
-        my ( $status, $status_msg ) = $self->pwg->UploadImage();
-
+        my ( $status, $status_msg, $content ) = $self->pwg->UploadImage( $self->YieldCallback, $self->progressbar_refresh );
+        my $ok = 0;
+        # HTTP REQUEST OK
         if ( $status ){
+            # PIWIGO RESULT ( HTTP may be ok while Piwigo is not )
+            $ok = 'fail' eq $content->{stat} ? 0 : 1;
+        }
+        else{
+            Wx::LogMessage(
+                "% %s : %s",
+                gettext("Communication error with"),
+                $self->pwg->site_url,
+                $status_msg,
+            );
+        } 
+
+        if($ok){
             $msg = sprintf(
-                "%s : %s upload succcessful.",
+                "%s : %s - %s.",
                 $site_name,
-                $file
+                $file,
+                gettext("upload succcessful"),
             );
 
@@ -979 +1001 @@
         } else {
             $msg = sprintf(
-                "An error has occured.\n%s : %s upload is cancelled.\n$status_msg",
+                "An error has occured.\n%s : %s upload is cancelled.\n%s",
                 $site_name,
-                $file
+                $file,
+                Dumper($content),
             );
             $rejected++;
@@ -1009 +1032 @@
     my $duration = $time_end - $time_begin;
     $msg = sprintf(
-        "%s images processed\n\n%s images uploaded\n\n%s images in errors and not uploaded - $last_error\n\nDuration : %s seconds",
+        "%s images processed\n\n%s images uploaded\n\n%s images in errors and not uploaded - \n%s\n\nDuration : %s seconds",
         $self->count - 1,
         $uploaded,
         $rejected,
+        $last_error,
         $duration,
     );

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

@@ -236 +236 @@
 
 sub UploadImage {
-    my ( $self ) = @_;
+    my ( $self, $yield_callback ) = @_;
 
     my $file_sum;
@@ -279 +279 @@
     my $status = 0;
     my $status_line = "An error has occured during upload.";
+    my $content = {};
     while(1){
         if(!defined($image_id)){
@@ -286 +287 @@
                 type => 'file',
                 original_sum => $original_sum,
+                yield_callback => $yield_callback,
             };
     
@@ -291 +293 @@
                 $resized_params
             );
-            
+
+            $yield_callback->() if 'CODE' eq ref($yield_callback);
             $status_line = $resized_params->{message};
             last if !$resized_params->{ok};
@@ -299 +302 @@
                 type => 'thumb',
                 original_sum => $original_sum,          
+                yield_callback => $yield_callback,
             };
     
@@ -305 +309 @@
             );
 
+            $yield_callback->() if 'CODE' eq ref($yield_callback);
             $status_line = $thumb_params->{message};
             last if !$thumb_params->{ok};
@@ -327 +332 @@
                 type => 'high',
                 original_sum => $original_sum,
+                yield_callback => $yield_callback,
             };
     
@@ -335 +341 @@
                     $high_params
                 );
+                $yield_callback->() if 'CODE' eq ref($yield_callback);
 
                 $status_line = $high_params->{message};
@@ -353 +360 @@
                 tag_ids           => $self->site_tags,
             };
+            $yield_callback->() if 'CODE' eq ref($yield_callback);
         }
     
@@ -359 +367 @@
             $form
         );
+
+        eval {
+            $content = from_json(
+                $result->content
+            );
+        };
+
     
         $status = $result->is_success;
         $status_line = $result->status_line; 
+
         last;
     }
     
-    return ( $status,  $status_line);
+    return ( $status,  $status_line, $content);
 }
  
@@ -454 +470 @@
             }
         );
-
+        $params->{yield_callback}->() if 'CODE' eq ref($params->{yield_callback});
         $params->{ok} = 1;
         if ($response->code != 200) {