Changeset 3509 for extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm

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.

File:

• extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm (modified) (11 diffs)

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) {