Changeset 3194 for extras

Timestamp:

Mar 13, 2009, 10:15:21 PM (16 years ago)

Author:

ronosman

Message:

Bug 939 fixed. Use pwg.images.addChunk for upload.

File:

• extras/pLoader/trunk/src/Uploader/PWG/WebServices.pm (modified) (10 diffs)

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

@@ -22 +22 @@
 use strict;
 use warnings;
-use MIME::Base64; 
+use MIME::Base64 qw(encode_base64); 
 use JSON;
 use LWP::UserAgent;
@@ -29 +29 @@
 use File::Slurp;
 use Encode qw/encode decode/;
+use POSIX qw(ceil floor);
 use base qw/
            Uploader::Object
@@ -57 +58 @@
            action_result
            upload_high
+           chunk_size
       / 
 );
@@ -81 +83 @@
     $self->password(
         $self->{site_password}
+    );
+    
+    $self->chunk_size(
+        $self->{chunk_size}||500_000
     );
     
@@ -159 +165 @@
 sub UploadImage {
     my ( $self ) = @_;
-    
-
-
-    my $file_content = encode_base64(
-        read_file(
-            $self->site_resized_file,
-            binmode => ':raw',
-        )
-    );
 
     my $file_sum = file_md5_hex(
@@ -173 +170 @@
     );
  
-    my $thumbnail_content = encode_base64(
-        read_file(
-            $self->site_thumb_file,
-            binmode => ':raw',
-        )
-    );
 
     my $thumbnail_sum = file_md5_hex(
@@ -198 +189 @@
     );
 
-    #print Dumper $result;
     my $hresult = {};
         eval {
@@ -205 +195 @@
             );
         };
-    #print Dumper $hresult;
+
     my $image_id = $hresult->{result}{$original_sum};
     if(!defined($image_id)){
+        $self->send_chunks(
+            {
+                filepath => $self->site_resized_file,
+                type => 'file',
+                original_sum => $original_sum,
+            }
+        );
+
+        $self->send_chunks(
+            {
+                filepath => $self->site_thumb_file,
+                type => 'thumb',
+                original_sum => $original_sum,
+            }
+        );
+        
+        
         $form = {
             method            => 'pwg.images.add',
             original_sum      => $original_sum,
             file_sum          => $file_sum,
-            file_content      => $file_content,
             thumbnail_sum     => $thumbnail_sum,
-            thumbnail_content => $thumbnail_content,
             categories        => $self->categories,
             name              => $self->site_image_name,
@@ -225 +230 @@
     
         if($self->upload_high){
-                $form->{high_content} = encode_base64(
-                                             read_file(
-                                                 $self->site_high_file,
-                                             binmode => ':raw',
-                                             )
-                                         );
-    
-                $form->{high_sum}     = $original_sum;
+            $self->send_chunks(
+                {
+                    filepath => $self->site_high_file,
+                    type => 'high',
+                    original_sum => $original_sum,
+                }
+            );
+
+            $form->{high_sum}     = $original_sum;
         }
     }
@@ -274 +280 @@
     return ( $result->is_success, $result->status_line );
         
-} 
+}
+
+
+sub send_chunks {
+    my ( $self, $params ) = @_;
+
+    my $content = encode_base64(
+        read_file(
+            $params->{filepath},
+            binmode => ':raw',
+        )
+    );
+
+    my $content_length = length($content);
+    my $nb_chunks = ceil($content_length / $self->chunk_size);
+
+    my $chunk_pos = 0;
+    my $chunk_id = 1;
+    while ($chunk_pos < $content_length) {
+        my $chunk = substr(
+            $content,
+            $chunk_pos,
+            $self->chunk_size
+        );
+        $chunk_pos += $self->chunk_size;
+
+        my $response = $self->uagent->post(
+            $self->urlbase.'/ws.php?format=json',
+            {
+                method       => 'pwg.images.addChunk',
+                data         => $chunk,
+                original_sum => $params->{original_sum},
+                position     => $chunk_id,
+                type         => $params->{type},
+            }
+        );
+
+        #printf(
+        #    'chunk %05u of %05u for %s "%s"'."\n",
+        #    $chunk_id,
+        #    $nb_chunks,
+        #    $params->{type},
+        #    $params->{filepath}
+        #);
+        if ($response->code != 200) {
+            printf("response code    : %u\n", $response->code);
+            printf("response message : %s\n", $response->message);
+        }
+
+        $chunk_id++;
+    }
+}
+
+ 
 1;