Changeset 4086

Timestamp:

Oct 22, 2009, 6:23:52 PM (15 years ago)

Author:

ronosman

Message:

bug 1201 fixed : pLoader crashes when path or filename contains unicode characters. All filename or path on windows must be ANSI converted when using perl file operators.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/wxApp.pm (modified) (1 diff)
• GUI/wxFrameAUI.pm (modified) (2 diffs)
• ImageList.pm (modified) (4 diffs)

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

@@ -336 +336 @@
     # to check if we can use stored cache
     $self->imagelist_version(
-        '4'
+        '5'
     );
 

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

@@ -22 +22 @@
 use Carp;
 use Wx;
+use Win32;
 use Wx::DND;
 use Wx qw/
@@ -1605 +1606 @@
     my $files = [
         map {
-            encode('iso-8859-1', $_)
+            # to make sure that unicode chars in filenames are supported
+            {
+                ANSIPathName => $^O =~ /MSWin32/ ? Win32::GetANSIPathName($_) : encode('iso-8859-1', $_),
+                PathName => $_,
+            },
         }@$file_paths    
     ];
 
-    @$files = sort @$files;    
+    @$files = sort { $a->{PathName} cmp $b->{PathName} } @$files;    
 
     $self->imagelist->SetNewFiles(

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

@@ -204 +204 @@
 
     map {
-        my $info = $self->_read_exif_metatdata($_);
+        my $info = $self->_read_exif_metatdata($_->{ANSIPathName});
         my $is_new_image = $self->_add_image($_, $info, $i);    
         $self->SetCurrentImage($i);
@@ -269 +269 @@
     ) if !$self->image_sums;
 
-    my $sum = file_md5_hex($file);
+    my $sum = file_md5_hex($file->{ANSIPathName});
 
     my $image;
     if ( !exists $self->image_sums->{$sum} ){
-print "_add_image ", $file, "\n";
+        print "_add_image ", Dumper $file, "\n";
         # append to image list
         $image = Uploader::Image->new(
         {
-                file              => $file,
+                file              => $file->{ANSIPathName},
                 file_sum          => $sum,
-                site_name         => $self->_default_photo_name($file, $info, $i),
+                site_name         => $self->_default_photo_name($file->{PathName}, $info, $i),
                 site_author       => $self->author,
                 exif_metadata     => $self->_select_exif_data($info),
@@ -285 +285 @@
                 site_categories   => [],
                 site_tags         => [],
-                site_high_file    => $_,
+                site_high_file    => $file->{ANSIPathName},
             }
         );
@@ -996 +996 @@
                 gettext("upload succcessful"),
             );
-
+            
             push @{$self->uploaded_images}, $_;
             $uploaded++;