Changeset 3230

Timestamp:

Mar 29, 2009, 1:00:42 PM (15 years ago)

Author:

ronosman

Message:

Bug 952. Transfert of filenames with accentuated characters is aborted.

File:

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

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

@@ -28 +28 @@
 use Digest::MD5::File qw/file_md5_hex md5_hex/;
 use File::Slurp;
-use Encode qw/encode decode/;
+use Encode qw/encode decode is_utf8/;
 use POSIX qw(ceil floor);
 use base qw/
@@ -166 +166 @@
     my ( $self ) = @_;
 
-    my $file_sum = file_md5_hex(
-        $self->site_resized_file
-    );
+    my $file_sum;
+
+    eval {
+        $file_sum = file_md5_hex(
+            encode('iso-8859-1', $self->site_resized_file)
+        );
+    };
  
 
     my $thumbnail_sum = file_md5_hex(
-        $self->site_thumb_file,
+        encode('iso-8859-1', $self->site_thumb_file),
     );
 
     my $original_sum = file_md5_hex(
-        $self->site_high_file
+        encode('iso-8859-1', $self->site_high_file)
     );
 
@@ -200 +204 @@
         $self->send_chunks(
             {
-                filepath => $self->site_resized_file,
+                filepath => encode('iso-8859-1', $self->site_resized_file),
                 type => 'file',
                 original_sum => $original_sum,
@@ -208 +212 @@
         $self->send_chunks(
             {
-                filepath => $self->site_thumb_file,
+                filepath => encode('iso-8859-1', $self->site_thumb_file),
                 type => 'thumb',
                 original_sum => $original_sum,
@@ -232 +236 @@
             $self->send_chunks(
                 {
-                    filepath => $self->site_high_file,
+                    filepath => encode('iso-8859-1', $self->site_high_file),
                     type => 'high',
                     original_sum => $original_sum,