Changeset 4121

Timestamp:

Oct 26, 2009, 9:39:44 PM (15 years ago)

Author:

ronosman

Message:

Bug 1213 fixed. Accented characters in file and path names make pLoader Linux crash.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/wxFrameAUI.pm (modified) (2 diffs)
• ImageList.pm (modified) (12 diffs)
• PWG/WebServices.pm (modified) (7 diffs)

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

@@ -152 +152 @@
 use Storable;
 use Uploader::GUI::wxPropertyGridPanel;
-use Encode qw/encode decode is_utf8/;
 use utf8;
 $|=1;
@@ -1436 +1435 @@
             # to make sure that unicode chars in filenames are supported
             {
-                ANSIPathName => $^O =~ /MSWin32/ ? Win32::GetANSIPathName($_) : encode('iso-8859-1', $_),
+                ANSIPathName => $^O =~ /MSWin32/ ? Win32::GetANSIPathName($_) : $_,
                 PathName => $_,
             },

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

@@ -29 +29 @@
 use Storable;
 use Digest::MD5::File qw/file_md5_hex md5_hex/;
-use Encode qw/encode decode is_utf8/;
 use Wx::Locale qw/:default/;
 use Wx;
@@ -200 +199 @@
     );
     $self->current_image->preview_file( 
-        encode('iso-8859-1', $self->current_image->preview_file)
+        $self->current_image->preview_file
     );
 
@@ -335 +334 @@
     my ( $self, $file, $info, $i ) = @_;
     
-#    $file = encode('iso-8859-1', $file);
     
     my $name;
@@ -571 +569 @@
             "%s:%s",
             $self->type,
-            encode('iso-8859-1', $self->current_image->wx_thumb_file),
+            $self->current_image->wx_thumb_file,
         )
     );
@@ -629 +627 @@
             "%s:%s",
             $self->type,
-            encode('iso-8859-1', $self->current_image->preview_file),
+            $self->current_image->preview_file,
         )
     );
@@ -708 +706 @@
             "%s:%s",
             $self->type,
-            encode('iso-8859-1', $self->current_image->site_resized_file),
+            $self->current_image->site_resized_file,
         )
     );
@@ -732 +730 @@
 
     my $status = $image->ReadImage(
-        encode('iso-8859-1', $self->current_image->site_resized_file)
+        $self->current_image->site_resized_file
     );
     warn "$status" if $status ;
@@ -760 +758 @@
             "%s:%s",
             $self->type,
-            encode('iso-8859-1', $self->current_image->site_thumb_file),
+            $self->current_image->site_thumb_file,
         )
     );
@@ -1126 +1124 @@
         }        
         $image->Write(
-            filename=>encode('iso-8859-1', $self->current_image->site_high_file)
+            $self->current_image->site_high_file
         );
         warn "$status ", $self->current_image->site_high_file, "\n" if $status ;
@@ -1206 +1204 @@
     
     my $status = $image->ReadImage(
-        encode('iso-8859-1', $file_out)
+        $file_out
     );      
 printf("gravity %s, color %s, pointsize %s, x %s, y %s\n", $gravity, $fill, $text_size, $x, $y);    
@@ -1226 +1224 @@
             "%s:%s",
             $self->type,
-            encode('iso-8859-1', $file_out),
+            $file_out,
         )
     );
@@ -1311 +1309 @@
         # write resizd file
         $image->Write(
-            filename=>encode('iso-8859-1', $file)
+            $file
         );
         warn "$status ", $file, "\n" if $status ;

extensions/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 is_utf8/;
 use POSIX qw(ceil floor);
 use base qw/
@@ -242 +241 @@
     eval {
         $file_sum = file_md5_hex(
-            encode('iso-8859-1', $self->site_resized_file)
+            $self->site_resized_file
         );
     };
@@ -248 +247 @@
 
     my $thumbnail_sum = file_md5_hex(
-        encode('iso-8859-1', $self->site_thumb_file),
+        $self->site_thumb_file,
     );
 
     my $original_sum = file_md5_hex(
-        encode('iso-8859-1', $self->site_high_file)
+        $self->site_high_file
     );
 
@@ -272 +271 @@
         };
 
-    my $site_image_name = is_utf8($self->site_image_name) ? 
-                                  $self->site_image_name : 
-                                  encode('utf8', $self->site_image_name);
+    my $site_image_name = $self->site_image_name; 
 
     my $image_id = $hresult->{result}{$original_sum};
@@ -284 +281 @@
                 
             my $resized_params = {
-                filepath => encode('iso-8859-1', $self->site_resized_file),
-                type => 'file',
-                original_sum => $original_sum,
+                filepath       => $self->site_resized_file,
+                type           => 'file',
+                original_sum   => $original_sum,
                 yield_callback => $yield_callback,
             };
@@ -299 +296 @@
           
             my $thumb_params = {
-                filepath => encode('iso-8859-1', $self->site_thumb_file),
-                type => 'thumb',
-                original_sum => $original_sum,          
+                filepath       => $self->site_thumb_file,
+                type           => 'thumb',
+                original_sum   => $original_sum,                
                 yield_callback => $yield_callback,
             };
@@ -329 +326 @@
             };
             my $high_params = {
-                filepath => encode('iso-8859-1', $self->site_high_file),
-                type => 'high',
-                original_sum => $original_sum,
+                filepath       => $self->site_high_file,
+                type           => 'high',
+                original_sum   => $original_sum,
                 yield_callback => $yield_callback,
             };