Changeset 4279

Timestamp:

Nov 16, 2009, 12:28:47 PM (14 years ago)

Author:

ronosman

Message:

Feature 1064 added : improve upload progress dialog box to display current operation and the rank of the photo being uploaded.

Location:

extensions/pLoader/trunk

Files:

• locale/fr_FR/pLoader.mo (modified) (previous)
• locale/fr_FR/pLoader.po (modified) (2 diffs)
• res/progress_wdr.pl (modified) (5 diffs)
• src/Uploader/GUI/wxFrameAUI.pm (modified) (7 diffs)
• src/Uploader/GUI/wxImageProcessingProgressDlg.pm (modified) (5 diffs)
• src/Uploader/ImageList.pm (modified) (6 diffs)
• src/Uploader/PWG/WebServices.pm (modified) (13 diffs)
• src/ploader.pl (modified) (2 diffs)

extensions/pLoader/trunk/locale/fr_FR/pLoader.po

@@ -254 +254 @@
 msgstr "Durée"
 
+msgid "seconds"
+msgstr "secondes"
+
 msgid "Categories"
 msgstr "Catégories"
@@ -470 +473 @@
 msgstr "Non sélectionnés"
 
+msgid "Uploading"
+msgstr "Transfère"
+
+msgid "Uploading resized"
+msgstr "Transfère la photo réduite"
+
+msgid "Uploading thumbnail"
+msgstr "Transfère la miniature"
+
+msgid "Uploading high definition"
+msgstr "Transfère la photo HD"
+
+msgid "Checksum for"
+msgstr "Checksum de"
+
+msgid "Communication error with"
+msgstr "Erreur de communication avec"
+
+msgid "Uploaded"
+msgstr "Transféré"
+
+msgid "Preparing resized image for"
+msgstr "Prépare la photo réduite de"
+
+msgid "Close"
+msgstr "Fermer"
+
+msgid "on"
+msgstr "sur"
+
+msgid "photos added to the selection"
+msgstr "photos ajoutées à la sélection"
+
+msgid "errors"
+msgstr "erreurs"

extensions/pLoader/trunk/res/progress_wdr.pl

@@ -1 @@
-#-----------------------------------------------------------------------------
-# Perl source generated by wxDesigner from file: progress.wdr
-# Do not modify this file, all changes will be lost!
-#-----------------------------------------------------------------------------
-
 use Wx;
 use strict;
@@ -23 +18 @@
 use vars qw($ID_LINE); $ID_LINE = 10003;
 use vars qw($ID_PROGRESS_OK); $ID_PROGRESS_OK = 10004;
+use vars qw($ID_PROGRESS_TXT2); $ID_PROGRESS_TXT2 = 10005;
 
 sub ProcessingProgress {
@@ -29 +25 @@
     my( $item1 ) = Wx::BoxSizer->new( wxVERTICAL );
     
-    my( $item2 ) = Wx::StaticText->new( $_[0], $main::ID_PROGRESS_TXT, "Processing", wxDefaultPosition, wxDefaultSize, 0 );
+    my( $item2 ) = Wx::StaticText->new( $_[0], $main::ID_PROGRESS_TXT, "", wxDefaultPosition, wxDefaultSize, 0 );
     $item1->AddWindow( $item2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
@@ -38 +34 @@
 
     $item1->AddSpace( 20, 30, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    my( $item30 ) = Wx::StaticText->new( $_[0], $main::ID_PROGRESS_TXT2, "", wxDefaultPosition, wxDefaultSize, 0 );
+    $item1->AddWindow( $item30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     my( $item4 ) = Wx::Gauge->new( $_[0], $main::ID_PROGRESS_GAUGE, 100, wxDefaultPosition, [400,12], 0 );
@@ -67 +66 @@
 }
 
-# Menu bar functions
-
-
-# Toolbar functions
-
-
-# End of generated file

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

@@ -214 +214 @@
     );
 
+    $self->imagelist->progress_msg_details_refresh(
+        sub { $self->UploadProgressMessageDetailsRefresh(@_) }
+    );
 
     $self->imagelist->progressbar_refresh(
@@ -1401 +1404 @@
                 title => gettext("Image processing progress information"),
                 bt_label => gettext("Cancel image processing"), 
+                bt_close_label => gettext("Close"), 
              }
         )        
@@ -1706 +1710 @@
     my ( $self, $msg ) = @_;    
 
+    Wx::Yield();
+
     $self->upload_progressdlg->processing(
         $msg   
     );  
+    $self->upload_progressdlg->LogProgress();
 
     Wx::Yield();
 }
+
+sub UploadProgressMessageDetailsRefresh {
+    my ( $self, $msg ) = @_;    
+
+    Wx::Yield();
+
+    $self->upload_progressdlg->processing_details(
+        $msg   
+    );  
+    $self->upload_progressdlg->LogProgress();
+
+    Wx::Yield();
+}
+
 
 sub UploadProgressThumbnailRefresh {
@@ -1731 +1752 @@
 
 sub UploadProgressBarRefresh {
-    my ( $self, $ratio ) = @_;  
-
-    $ratio = $self->imagelist->count > 1 ? 1 : $ratio; 
+    my ( $self, $value ) = @_;  
+
     eval {
         $self->upload_progressdlg->progress(
-            $ratio*$self->imagelist->count * ( 100/scalar @{$self->imagelist->image_selection} )
+            $value
         );
         $self->upload_progressdlg->LogProgress();
     };
-    croak gettext("Upload cancelled") if $@;
+    #croak gettext("Upload cancelled") if $@;
 
     Wx::Yield();
@@ -1818 +1838 @@
                 { 
                     title    => gettext("Image upload progress information"),
-                    bt_label => gettext("Cancel upload"), 
+                    bt_label => gettext("Cancel upload"),
+                    bt_close_label => gettext("Close"), 
                  }
             )        
@@ -1913 +1934 @@
     wxTheApp->StoreLayoutProperties;
 
+    $self->manager->UnInit;
     $self->Destroy;
 }
@@ -2024 +2046 @@
     my( $self ) = @_;
 
-    $self->manager->UnInit;
 }
 

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

@@ -40 +40 @@
            processing
            txtprocessing
+           processing_details
+           txtprocessing_details
            image
            cancelled
+           bt_close_label
       / 
 );
@@ -62 +65 @@
     $self->gauge( $self->FindWindow($main::ID_PROGRESS_GAUGE) );
     $self->txtprocessing( $self->FindWindow($main::ID_PROGRESS_TXT) );
+    $self->txtprocessing_details( $self->FindWindow($main::ID_PROGRESS_TXT2) );
     $self->image( $self->FindWindow($main::ID_STATICBITMAP) );
     $self->gauge->SetForegroundColour(wxGREEN);
@@ -68 +72 @@
     $self->btok->SetLabel(
         $params->{bt_label}||'Cancel'
+    );
+    $self->bt_close_label(
+        $params->{bt_close_label}||'Close'
     );
 
@@ -94 +101 @@
         $self->processing
     );
+    $self->txtprocessing_details->SetLabel(
+        $self->processing_details
+    );
     $self->gauge->SetValue(
-        $self->progress
+        $self->progress 
     );
 }
@@ -107 +117 @@
     $self->image->Show(0);
     $self->gauge->Show(0);
-
+    # for i18n
     $self->btok->SetLabel(
-        'Close'
+        $self->bt_close_label
     );
         
+    $self->txtprocessing_details->SetLabel("");
 }
 

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

@@ -72 +72 @@
                 UploadImagesViewerCallback
                 progress_thumbnail_refresh
+                progress_msg_details_refresh
                 progress_msg_refresh
                 progressbar_refresh
@@ -102 +103 @@
                 gravity
                 rgbcolor
+                upload_msg
+                upload_selection_count
+                upload_uploaded_count
+                upload_rejected_count
+                upload_last_error
+                upload_error_content
+                upload_begin_time
+                upload_end_time
+                upload_duration
+                upload_file
+                upload_name
      /
 );
@@ -263 +275 @@
     $self->SetNewFilesDisplayEndInfoCallback->(
         sprintf(
-            "%s images added to the selection\n\n%s errors",
+            "%s : %s\n\n%s : %s",
+            gettext("photos added to the selection"),
             $self->count,
-            $errors
+            gettext("errors"),
+            $errors,
             
         )
@@ -867 +881 @@
     my $viewer_callback = $self->UploadImagesViewerCallback ;
 
-
+    $self->image_selection([]) if !defined $self->image_selection;
     $self->upload_rejects(
         []
     );
 
-    my $count = 1;
-    my $msg;
     $self->count(
-        $count
-    );
-    my $uploaded = 0;
-    my $rejected = 0;
-    my $time_begin = time;
-    my $last_error;
-    map {
+        1
+    );
+
+    $self->upload_uploaded_count(0);
+    $self->upload_rejected_count(0);
+    $self->upload_begin_time(time);
+    $self->upload_selection_count(scalar @{$self->image_selection});
+    foreach(@{$self->image_selection}) {
         # current image object          
         $self->current_image(
             $self->GetImage($_)
         );
-
-        my ( $vol, $dir, $file ) = File::Spec->splitpath(
-            $self->current_image->file
-        );
-        
-        my $site_name = $self->current_image->site_name;
-    
-        my $filename = $self->current_image->file_sum ;
-
-        # lately defined to make sure we have the last global properties ( resize_w, resize_h )
-        $self->current_image->site_resized_file( 
-            File::Spec->catfile(
-                $self->site_resized_dir,
-                sprintf(
-                    "%s_%sx%s.%s",
-                    $filename,
-                    $self->resize_w,
-                    $self->resize_h,
-                    $self->type,
-                )
-            )
-        );
-        
-        $msg = sprintf(
-            "Preparing resized image for %s - %s",
-            $site_name,
-            $file,
-        ); 
-
-        eval {
-            # set current image thumbnail
-            $self->progress_thumbnail_refresh->();
-
-            $self->progress_msg_refresh->($msg);
-    
-            # update upload progress dialog
-            $self->progressbar_refresh->(0.05);
-        };
-        # user cancelled : dialog box is destroyed
-        croak "Upload cancelled. ", $@ if $@ ;
-
-        if( $self->create_resized ){
-            eval {
-                if(!$self->CreateResized()){
-                    printf("CreateResized failed %s. Use ResizeCallback\n", $@);
-                    # use method provided by the caller
-                    # source, target, type, ratio, width, $height
-                    $self->ResizeCallback->(
-                        $self->current_image->file,
-                        $self->current_image->site_resized_file,
-                        $self->type,
-                        undef,
-                        $self->resize_w,
-                        $self->resize_h,
-                        $self->quality,
-                    );
-                
-                    $self->RotateImage(
-                        $self->current_image->site_resized_file,
-                    ) if $self->auto_rotate;
-                }
-            };
-            $self->_set_exif_tag(
-                $self->current_image->site_resized_file,
-                'Orientation',
-                'Horizontal (normal)',
-            ) if $self->auto_rotate;
-
-            $self->CreateWatermark(
-               $self->watermark_text,
-               $self->watermark_text_size,
-               $self->watermark_position,
-               $self->watermark_x,
-               $self->watermark_y,
-               $self->watermark_color,
-               $self->current_image->site_resized_file
-           ) if $self->watermark_activate;
-        }
-        # the original is at the right size, no need to create a resize
-        else {
-            $self->current_image->site_resized_file(
-                $self->current_image->file,
-            );
-        }
-
-
-
-        # if upload high, rotate a copy of original file
-        if($self->upload_high){
-            $self->CreateHigh();
-        }
-
-        # Resized and original are ready
-        $self->progressbar_refresh->(0.10);
-
-
-        $msg = sprintf(
-            "Preparing thumbnail for %s - %s",
-            $site_name,
-            $file,
-        );
-
-        eval {
-            $self->progress_msg_refresh->($msg);
-        };
-        croak "Upload cancelled. ", $@ if $@ ;
-
-        eval {
-            $self->CreateThumbnail();
-        };
-
-        if($@){
-            $msg = sprintf(
-                "An error has occured %s - %s\n$@",
-                $site_name,
-                $file
-            );
-        }
-        else{
-            $msg = sprintf(
-                "Uploading %s - %s",
-                $site_name,
-                $file
-            );
-        }
-        eval {
-            $self->progress_msg_refresh->($msg);
-            # Thumbnail is ready
-            $self->progressbar_refresh->(0.20);
-        };
-        croak "Upload cancelled. ", $@ if $@ ;
-
-        # photo metadata
-        $self->_prepare_upload_properties();            
-        my ( $status, $status_msg, $content ) = $self->pwg->UploadImage( $self->YieldCallback, $self->progressbar_refresh );
-        my $ok = 0;
-        # HTTP REQUEST OK
-        if ( $status ){
-            # PIWIGO RESULT ( HTTP may be ok while Piwigo is not )
-            $ok = 'fail' eq $content->{stat} ? 0 : 1;
-        }
-        else{
-            Wx::LogMessage(
-                "%s %s : %s",
-                gettext("Communication error with"),
-                $self->pwg->site_url,
-                $status_msg,
-            );
-        } 
-
-        if($ok){
-            $msg = sprintf(
-                "%s : %s - %s.",
-                $site_name,
-                $file,
-                gettext("upload succcessful"),
-            );
-            
-            push @{$self->uploaded_images}, $_;
-            $uploaded++;
-        } else {
-            $msg = sprintf(
-                "An error has occured.\n%s : %s upload is cancelled.\n%s",
-                $site_name,
-                $file,
-                Dumper($content),
-            );
-            $rejected++;
-            $last_error = $status_msg;
-        }       
-        
-        $count++;
+        # prepare resized, high, thumbnail
+        $self->_upload_selection_prepare();
+
+        # transfert resized, high, thumbnail to site
+        my $status = $self->_upload_selection_transfert();
+        # log operations
+        $self->_upload_selection_log($status);
         $self->count(
-            $count
-        );
-        # update upload progress dialog
-        eval {
-            $self->progress_msg_refresh->($msg);
-            $self->progressbar_refresh->(1);
-        };
-        croak "Upload cancelled. ", $@ if $@ ;
-        
-    }
-    @{$self->image_selection} if defined 
-        $self->image_selection;
+            1+$self->count
+        );
+    }
 
     if($self->remove_uploaded_from_selection){
@@ -1076 +915 @@
         $viewer_callback->();
     }
-    my $time_end = time;
-    my $duration = $time_end - $time_begin;
-    $msg = sprintf(
-        "%s images processed\n\n%s images uploaded\n\n%s images in errors and not uploaded - \n%s\n\nDuration : %s seconds",
-        $self->count - 1,
-        $uploaded,
-        $rejected,
-        $last_error,
-        $duration,
-    );
-    $self->progress_endinfo_refresh->($msg);
+
+    $self->_upload_selection_final_log();
+}
+
+sub _upload_selection_prepare {
+    my ( $self ) = @_;
+
+    $self->progress_thumbnail_refresh->();
+    # PREPARE
+    $self->_set_site_resized_file();
+    $self->_set_upload_msg(gettext("Preparing resized image for"));
+    $self->_upload_progress();
+
+    if( $self->create_resized ){
+        $self->_create_site_resized_file();
+        $self->_set_upload_msg(gettext("Resized image done for"));
+        $self->_upload_progress();
+    }
+    # the original is at the right size, no need to create a resize
+    else {
+        $self->current_image->site_resized_file(
+            $self->current_image->file,
+        );
+    }
+
+    # if upload high, rotate a copy of original file
+    if($self->upload_high){
+        $self->CreateHigh();
+        $self->_set_upload_msg(gettext("HD image done for"));
+        $self->_upload_progress();
+    }
+
+    eval {
+        $self->CreateThumbnail();
+    };
+    $self->_set_upload_msg(gettext("Thumbnail image done for"));
+    $self->_upload_progress();
+
+    # photo metadata
+    $self->_prepare_upload_properties();        
+
+}
+
+sub _upload_progress {
+    my ( $self, $value ) = @_;
+
+    eval {
+        $self->progress_msg_refresh->(
+            $self->upload_msg
+        );
+        # set current image thumbnail
+        # update upload progress dialog
+        #$self->progressbar_refresh->($value);
+    };
+    # user cancelled : dialog box is destroyed
+    croak gettext("Upload cancelled"), " .", $@ if $@ ;
+
+
+}
+
+sub _set_upload_msg {
+    my ( $self, $msg, $errmsg ) = @_;
+
+    $self->upload_msg(
+        sprintf(
+            "%s : %s - %s\n\n%s %s %s %s\n%s",
+            $msg,
+            $self->upload_file,
+            $self->upload_name,
+            gettext("Photo"),
+            $self->count,
+            gettext("on"),
+            $self->upload_selection_count,
+            $errmsg
+        )
+    );
+}
+
+sub _upload_selection_transfert {
+    my ( $self ) = @_;
+
+    $self->_set_upload_msg(gettext("Uploading"));
+    $self->_upload_progress(0);
+
+    # UPLOAD
+    my ( $status, $status_msg, $content ) = $self->pwg->UploadImage(
+        { 
+            yield=>$self->YieldCallback, 
+            bar=>$self->progressbar_refresh, 
+            msg=>$self->progress_msg_refresh,
+            msg_details=>$self->progress_msg_details_refresh,
+            resized_msg=>gettext("Uploading resized"),
+            thumbnail_msg=>gettext("Uploading thumbnail"),
+            highdef_msg=>gettext("Uploading high definition"),
+            checksum_msg=>gettext("Checksum for"),
+        } 
+    );
+    my $ok = 0;
+    # HTTP REQUEST OK
+    if ( $status ){
+        # PIWIGO RESULT ( HTTP may be ok while Piwigo is not )
+        $ok = 'fail' eq $content->{stat} ? 0 : 1;
+    }
+    else{
+        Wx::LogMessage(
+            "%s %s : %s",
+            gettext("Communication error with"),
+            $self->pwg->site_url,
+            $status_msg,
+        );
+    }
+    $self->upload_last_error(
+        $status_msg
+    );
+
+    $self->upload_error_content(
+        $content
+    );
+
+    $ok;
+}
+
+sub _upload_selection_log {
+    my ( $self, $ok ) = @_;
+
+    if($ok){
+        $self->_set_upload_msg(gettext("Uploaded"));
+        $self->_upload_progress(0);
+        push @{$self->uploaded_images}, $_;
+        $self->upload_uploaded_count(
+            1+$self->upload_uploaded_count        
+        );
+    } else {
+        $self->_set_upload_msg(gettext("An error has occured"), Dumper($self->upload_error_content));
+        $self->upload_rejected_count(
+            1+$self->upload_rejected_count
+        );
+    }   
+        
+}
+
+sub _upload_selection_final_log {
+    my ( $self ) = @_;
+
+    $self->upload_end_time(time);
+    $self->upload_duration(
+        $self->upload_end_time - $self->upload_begin_time
+    );
+
+    $self->progress_endinfo_refresh->(
+        sprintf(
+            "%s : %s\n\n%s : %s\n\n%s : %s\n\n\n%s : %s %s",
+            gettext("images processed"),
+            $self->count - 1,
+            gettext("images uploaded"),
+            $self->upload_uploaded_count,
+            gettext("images in errors and not uploaded"),
+            $self->upload_rejected_count,
+            gettext("Duration"),
+            $self->upload_duration,
+            gettext("seconds"),
+        )
+    );
+    $self->progress_msg_details_refresh(" ");
+}
+
+sub _set_site_resized_file {
+    my ( $self ) = @_;
+
+    my ( $vol, $dir, $file ) = File::Spec->splitpath(
+        $self->current_image->file
+    );
+
+    $self->upload_file(
+        $file
+    );
+        
+    $self->upload_name(
+        $self->current_image->site_name
+    );
+    my $filename = $self->current_image->file_sum ;
+
+    # lately defined to make sure we have the last global properties ( resize_w, resize_h )
+    $self->current_image->site_resized_file( 
+        File::Spec->catfile(
+            $self->site_resized_dir,
+            sprintf(
+                "%s_%sx%s.%s",
+                $filename,
+                $self->resize_w,
+                $self->resize_h,
+                $self->type,
+            )
+        )
+    );
+}
+
+sub _create_site_resized_file {
+    my ( $self ) = @_;
+
+    eval {
+        if(!$self->CreateResized()){
+            $self->__create_resized_fallback();
+        };
+
+        $self->_set_exif_tag(
+            $self->current_image->site_resized_file,
+            'Orientation',
+            'Horizontal (normal)',
+        ) if $self->auto_rotate;
+
+        $self->CreateWatermark(
+            $self->watermark_text,
+            $self->watermark_text_size,
+            $self->watermark_position,
+            $self->watermark_x,
+            $self->watermark_y,
+            $self->watermark_color,
+            $self->current_image->site_resized_file
+        ) if $self->watermark_activate;
+    }
+}
+
+sub _create_resized_fallback {
+    my ( $self ) = @_;
+    # use wx builtin rescale if IM fails
+    printf("CreateResized failed %s. Use ResizeCallback\n", $@);
+    # use method provided by the caller
+    # source, target, type, ratio, width, $height
+    $self->ResizeCallback->(
+        $self->current_image->file,
+        $self->current_image->site_resized_file,
+        $self->type,
+        undef,
+        $self->resize_w,
+        $self->resize_h,
+        $self->quality,
+    );
+                
+    $self->RotateImage(
+        $self->current_image->site_resized_file,
+    ) if $self->auto_rotate;
 }
 
@@ -1206 +1276 @@
         $file_out
     );      
-printf("gravity %s, color %s, pointsize %s, x %s, y %s\n", $gravity, $fill, $text_size, $x, $y);    
+
     my $ratio = $image->Get('height')/($self->resize_h||$image->Get('height'));
     $ratio||=1;
     $text ||="Your watermark";
     $image->Annotate(
-#        font => 'Vera.ttf',
         pointsize => $text_size*$ratio,
         fill => $fill,

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

@@ -28 +28 @@
 use Digest::MD5::File qw/file_md5_hex md5_hex/;
 use File::Slurp;
+use File::Spec;
 use POSIX qw(ceil floor);
 use base qw/
@@ -236 +237 @@
 
 sub UploadImage {
-    my ( $self, $yield_callback ) = @_;
+    my ( $self, $progress ) = @_;
 
     my $file_sum;
 
+    my $yield = $progress->{yield};
+    $yield->();
+    $progress->{msg_details}->(
+            sprintf(
+                "%s : %s", 
+                $progress->{checksum_msg}, 
+                $self->site_resized_file
+            )
+        );
     eval {
         $file_sum = file_md5_hex(
@@ -245 +255 @@
         );
     };
- 
-
+    $yield->();
+ 
+    $progress->{msg_details}->(
+            sprintf(
+                "%s : %s", 
+                $progress->{checksum_msg}, 
+                $self->site_thumb_file
+            )
+        );
     my $thumbnail_sum = file_md5_hex(
         $self->site_thumb_file,
     );
-
+   $yield->();
+ 
+    $progress->{msg_details}->(
+            sprintf(
+                "%s : %s", 
+                $progress->{checksum_msg}, 
+                $self->site_high_file
+            )
+        );
+ 
     my $original_sum = file_md5_hex(
         $self->site_high_file
@@ -260 +286 @@
     };
 
+    $yield->();
     my $result = $self->uagent->post(
         $self->urlbase.'/ws.php?format=json',
         $form
     );
+    $yield->();
 
     my $hresult = {};
@@ -285 +313 @@
                 type           => 'file',
                 original_sum   => $original_sum,
-                yield_callback => $yield_callback,
             };
-    
+
+            $progress->{current_msg} = $progress->{resized_msg};
+            $yield->();
             $self->send_chunks(
-                $resized_params
-            );
-
-            $yield_callback->() if 'CODE' eq ref($yield_callback);
+                $resized_params,
+                $progress,
+            );
+            $yield->();
+
             $status_line = $resized_params->{message};
             last if !$resized_params->{ok};
@@ -300 +330 @@
                 type           => 'thumb',
                 original_sum   => $original_sum,                
-                yield_callback => $yield_callback,
             };
     
+            $progress->{current_msg} = $progress->{thumbnail_msg};
+            $yield->();
             $self->send_chunks(
-                $thumb_params
-            );
-
-            $yield_callback->() if 'CODE' eq ref($yield_callback);
+                $thumb_params,
+                $progress,
+            );
+            $yield->();
             $status_line = $thumb_params->{message};
             last if !$thumb_params->{ok};
@@ -330 +361 @@
                 type           => 'high',
                 original_sum   => $original_sum,
-                yield_callback => $yield_callback,
             };
     
             if($self->upload_high){
                 $form->{high_sum} = $original_sum;
-    
+                $progress->{current_msg} = $progress->{highdef_msg};
+                $yield->();
                 $self->send_chunks(
-                    $high_params
-                );
-                $yield_callback->() if 'CODE' eq ref($yield_callback);
-
+                    $high_params,
+                    $progress
+                );
+                $yield->();
                 $status_line = $high_params->{message};
                 last if !$high_params->{ok};
-    
             }
         }
@@ -358 +388 @@
                 tag_ids           => $self->site_tags,
             };
-            $yield_callback->() if 'CODE' eq ref($yield_callback);
+            $yield->();
         }
 
@@ -364 +394 @@
         delete $form->{tag_ids} if '' eq $self->site_tags;
 
+        $yield->();
         $result = $self->uagent->post(
             $self->urlbase.'/ws.php?format=json',
             $form
         );
-
         eval {
             $content = from_json(
@@ -441 +471 @@
 
 sub send_chunks {
-    my ( $self, $params ) = @_;
-
+    my ( $self, $params, $progress ) = @_;
+
+    my $yield = $progress->{yield};
+    my ( $vol, $dir, $filename ) = File::Spec->splitpath($params->{filepath});
+
+    $yield->();
+    $progress->{bar}->(0);
+    $yield->();
+    $progress->{msg_details}->(
+        sprintf(
+            "%s : %s", 
+            $progress->{current_msg}, 
+            $filename
+        )
+    );
+
+
+    $yield->();
     my $content = read_file(
         $params->{filepath},
         binmode => ':raw',
     );
+    $yield->();
 
     my $content_length = length($content);
@@ -453 +500 @@
     my $chunk_pos = 0;
     my $chunk_id = 1;
+
+
     while ($chunk_pos < $content_length) {
+
         my $chunk = substr(
             $content,
@@ -460 +510 @@
         );
         $chunk_pos += $self->chunk_size;
-
         my $response = $self->uagent->post(
             $self->urlbase.'/ws.php?format=json',
@@ -471 +520 @@
             }
         );
-        $params->{yield_callback}->() if 'CODE' eq ref($params->{yield_callback});
+        $yield->();
+        $progress->{bar}->(100*($chunk_pos/$content_length));
+        $progress->{msg_details}->(
+            sprintf(
+                "%s : %s", 
+                $progress->{current_msg}, 
+                $filename
+            )
+        );
         $params->{ok} = 1;
         if ($response->code != 200) {

extensions/pLoader/trunk/src/ploader.pl

@@ -26 +26 @@
 use Wx::Locale qw/:default/;
 
+#$SIG{__DIE__} = \&OnDieHandler;
 
 
@@ -35 +36 @@
     $app->MainLoop();
 };
+
+sub OnDieHandler {
+    my ( $exception ) = @_;
+    
+    # if triggered in eval
+    # return if $^S;
+    print $exception;
+}
 1;