Changeset 5020 for extensions/pLoader

Timestamp:

Mar 2, 2010, 10:55:56 AM (14 years ago)

Author:

ronosman

Message:

Feature 1446 added : transmit the original filename.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• Image.pm (modified) (1 diff)
• ImageList.pm (modified) (4 diffs)
• PWG/WebServices.pm (modified) (6 diffs)

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

@@ -32 +32 @@
         site_author
         site_comment
+        site_original_filename
         exif_metadata
         add_rank

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

@@ -1204 +1204 @@
             $self->current_image->file
         );
-    
+        
+        $self->current_image->site_original_filename(
+            $file
+        );
         my ( $filename, $ext ) = split /\./, $file ;
     
@@ -1220 +1223 @@
 }
 
+
+
 sub CreateWatermark {
     my ( $self, $text, $text_size, $position, $x, $y, $color, $file_out ) = @_;
@@ -1264 +1269 @@
     # set default values only if not defined
     # || operator is not used because 0 is a choice value
-    # and woukd replace a valid choice with a default value
+    # and would replace a valid choice with a default value
     $self->reupload_action_files(1) 
         unless defined $self->reupload_action_files;
@@ -1292 +1297 @@
         $self->current_image->site_high_file
     );
+
+    $self->pwg->site_original_filename(
+        $self->current_image->site_original_filename
+    );
+
 
     $self->pwg->site_resized_file(

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

@@ -47 +47 @@
            tags
            categories
+           site_original_filename
            site_high_file
            site_resized_file
@@ -227 +228 @@
         );
     };
-
     if($@){
         printf("An error occured in post execution %s\n%s",
@@ -294 +294 @@
                 my $rval = $self->_send_chunks($_, $progress);
                 $status_line = $rval->{message};
-                last UPLOAD if !$rval->{ok};
+                if (!$rval->{ok}){
+                    $status = 0;
+                    last UPLOAD ;
+                }
             } @types;
           
@@ -301 +304 @@
                 method            => 'pwg.images.add',
                 original_sum      => $self->sum->{original},
+                original_filename => $self->site_original_filename,
                 file_sum          => $self->sum->{file},
                 thumbnail_sum     => $self->sum->{thumb},
@@ -639 +643 @@
         );
         $chunk_pos += $self->chunk_size;
+        #print "pwg.images.addChunk\n";
+        my $data = encode_base64($chunk);
+        #printf("chunk : %s, data %s\n", length $chunk, length $data);
         my $response = $self->uagent->post(
             $self->urlbase.'/ws.php?format=json',
             {
                 method       => 'pwg.images.addChunk',
-                data         => encode_base64($chunk),
+                data         => $data,
                 original_sum => $params->{original_sum},
                 position     => $chunk_id,
@@ -649 +656 @@
             }
         );
+#print Dumper $response;
         $yield->();
         $progress->{bar}->(100*($chunk_pos/$content_length));