Changeset 6522

Timestamp:

Jun 12, 2010, 9:07:43 AM (14 years ago)

Author:

ronosman

Message:

Refactor thread management to reduce memory footprint ( pLoader now starts with 60 Mo instead of 90 Mo ).

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/App.pm (modified) (15 diffs)
• ResizeManager.pm (modified) (1 diff)
• ResizeWorker.pm (added)
• ThreadManager.pm (added)
• TransferManager.pm (modified) (2 diffs)
• TransferWorker.pm (added)

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

@@ -134 +134 @@
 
 
-my @transfer_properties = qw/
-    transfer_thread
-    transfer_thread_queue
-    resize_thread
-    resize_thread_queue
-/;
-
 my @custom_events = qw/
     resize_start_event
@@ -151 +144 @@
 __PACKAGE__->mk_accessors(@localized_properties);
 __PACKAGE__->mk_accessors(@language_properties);
-__PACKAGE__->mk_accessors(@transfer_properties);
 __PACKAGE__->mk_accessors(@custom_events);
 
@@ -206 +198 @@
 
 
-sub cancel_queues {
-    my ( $self ) = @_;
-
-    $self->cancel_resize;
-    $self->cancel_transfer;
+sub cancel_all {
+    my ( $self ) = @_;
+
+    $self->resize_manager->cancel;
+    $self->transfer_manager->cancel;
 }
 
@@ -217 +209 @@
     my( $self ) = @_;
 
-    $self->stop_resize_manager;
-    $self->stop_transfer_manager;
+    $self->resize_manager->stop;
+    $self->transfer_manager->stop;
     $self->stop_single_instance_server;
     $self->login_dlg->Destroy;    
@@ -224 +216 @@
 
 
-}
-
-
-sub stop_queues {
-    my ( $self ) = @_;
-
-    $self->stop_resize;
-    $self->stop_transfer;
-}
-
-
-sub stop_resize_manager {
-    my( $self ) = @_;
-
-    $self->stop_resize;
-    $self->resize_thread->detach;
-}
-
-
-sub stop_transfer_manager {
-    my( $self ) = @_;
-
-    $self->stop_transfer;
-    $self->transfer_thread->detach;
-}
-
-sub cancel_transfer {
-    my( $self ) = @_;
-    
-    my $data : shared = "CANCEL";
-
-    $self->transfer_thread_queue->insert(0, $data);
-}
-
-
-sub stop_transfer {
-    my( $self ) = @_;
-    
-    my $data : shared = "STOP";
-
-    $self->transfer_thread_queue->insert(0, $data);
 }
 
@@ -759 +710 @@
     $self->resize_manager(
         Uploader::ResizeManager->new({
-            site_thumb_dir   => $self->thumb_dir,
-            wx_thumb_dir     => $self->wx_thumb_dir,
-            site_resized_dir => $self->resized_dir,
-            preferences      => sub { $self->preferences(@_) },
-            write_type       => 'jpg',
+            thumb_dir      => $self->thumb_dir,
+            wx_thumb_dir   => $self->wx_thumb_dir,
+            resized_dir    => $self->resized_dir,
+            preferences    => sub { $self->preferences(@_) },
+            progress_event => $resize_progress_event,
+            done_event     => $resize_done_event,
+            event_handler  => $self,
         })
     );
 
-    $self->init_resize_thread_queue;
     $self->init_resize_done_event_handler;
     $self->init_resize_progress_event_handler;
-}
-
-
-sub init_resize_thread_queue {
-    my ( $self ) = @_;
-
-    $self->resize_thread_queue(
-        Thread::Queue->new()
-    );
-
-    # resize worker starts when receiving data from the resize queue
-    # resize data must be sent to the calling $handler because $handler data
-    # cannot be updated inside the thread
-    $self->resize_thread(
-        $self->new_resize_thread
-    );
-
-}
-
-
-sub new_resize_thread {
-    my ( $self ) = @_;
-
-    threads->create( 
-        sub { 
-            my ( $handler, $resize_manager, $queue ) = @_;
-            while (my $data = $queue->dequeue ) {
-                
-                return 1 if 'STOP' eq $data;
-                if('CANCEL' eq $data){
-                    # remove pending
-                    while($queue->pending){
-                        # must check if valid $image hash
-                        $resize_manager->cancel_image(
-                            $queue->dequeue
-                        );
-                    }
-                }
-                else{
-                    $resize_manager->process_image(
-                        $handler,
-                        $resize_progress_event,
-                        $resize_done_event,
-                        $data
-                    );
-                }
-            }
-            printf("resize queue %s\n", $queue->pending);
-        },
-        $self,
-        $self->resize_manager,
-        $self->resize_thread_queue
-    );
-
 }
 
@@ -836 +734 @@
         sub {
             my ( $handler, $event ) = @_;
-            my $data : shared = shared_clone($event->GetData);
-            $handler->on_image_progress($data);
+            my $image : shared = shared_clone($event->GetData);
+            $handler->on_image_progress($image);
             # image is prepared, send to transfer queue
-            $self->transfer_thread_queue->enqueue($data);
+            $self->transfer_manager->add_images([ $image ]);
         } 
     );
@@ -1077 +975 @@
 
     my $app = {
-        site_thumb_dir   => $self->thumb_dir,
+        thumb_dir   => $self->thumb_dir,
         wx_thumb_dir     => $self->wx_thumb_dir,
-        site_resized_dir => $self->resized_dir,
+        resized_dir => $self->resized_dir,
         userdata_dir     => $self->userdata_dir,
         version          => $self->version,
@@ -1107 +1005 @@
     }
     else {
-        $self->stop_resize_manager;
+        $self->resize_manager->stop;
         $self->stop_single_instance_server;
     }
@@ -1283 +1181 @@
     $self->transfer_manager(
         Uploader::TransferManager->new({
-            site_thumb_dir   => $self->thumb_dir,
-            site_resized_dir => $self->resized_dir,
-            pwg              => $self->pwg,
+            pwg            => $self->pwg,
+            progress_event => $transfer_progress_event,
+            done_event     => $transfer_done_event,
+            event_handler  => $self,
         })
     );
@@ -1292 +1191 @@
         $image_progress_event
     );
-    $self->init_transfer_thread_queue;
+
     $self->init_transfer_done_event_handler;
     $self->init_transfer_progress_event_handler;
@@ -1314 +1213 @@
 
 
-sub init_transfer_thread_queue {
-    my ( $self ) = @_;
-
-    $self->transfer_thread_queue(
-        Thread::Queue->new()
-    );
-
-    # transfer worker starts when receiving data from the queue
-    # transfer data must be sent to the calling $handler because $handler data
-    # cannot be updated inside the thread
-    $self->transfer_thread(
-        $self->new_transfer_thread
-    );
-
-}
-
-
-sub new_transfer_thread {
-    my ( $self ) = @_;
-
-    threads->create( 
-        sub {
-            my ( $handler, $transfer_manager, $queue ) = @_;
-            while (my $data = $queue->dequeue ) {
-                return 1 if 'STOP' eq $data;
-                if('CANCEL' eq $data){
-                    while($queue->pending){
-                        $transfer_manager->cancel_image(
-                            $queue->dequeue
-                        );
-                    }
-                }
-                else{
-                    $transfer_manager->process_image(
-                        $handler,
-                        $transfer_progress_event,
-                        $transfer_done_event,
-                        $data
-                    );
-                }
-            }
-            printf("transfer queue %s\n", $queue->pending);
-        },
-        $self,
-        $self->transfer_manager,
-        $self->transfer_thread_queue
-    );
-
-}
 
 
@@ -1399 +1249 @@
 
 
-sub start_transfer {
-    my( $self, $images ) = @_;
-    
-    my $data : shared = shared_clone($images);
-
-    $self->transfer_thread_queue->enqueue($data);
-}
-
-
 sub start_resize {
     my( $self, $all_images ) = @_;
@@ -1417 +1258 @@
         $all_images
     );
-    printf("resize thread %s\n", $self->resize_thread);
-    $self->resize_thread_queue->enqueue(
-        map { shared_clone($_) }@$images
-    );
+
+    $self->resize_manager->add_images($images);
 
     Wx::PostEvent(
@@ -1435 +1274 @@
 
 
-sub stop_resize {
-    my( $self ) = @_;
-    
-    my $data : shared = "STOP";
-
-    $self->resize_thread_queue->insert(0,$data);
-}
-
-
 sub cancel_resize {
     my( $self ) = @_;
-    
-    my $data : shared = "CANCEL";
 
     #
-    if( $self->resize_thread_queue->pending and wxYES == Wx::MessageBox( 
+    if( $self->resize_manager->pending and wxYES == Wx::MessageBox( 
         sprintf(
             "Cancel %s pending job(s) ?",
-            $self->resize_thread_queue->pending,
+            $self->resize_manager->pending,
         ),
         "pLoader job processing",
         wxYES_NO|wxNO_DEFAULT| wxICON_QUESTION, ) 
     ){
-        $self->resize_thread_queue->insert(0,$data);
+        $self->resize_manager->cancel;
     }
 }

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

@@ -1 +1 @@
 package Uploader::ResizeManager;
-use threads;
-use threads::shared;
 use strict;
-use base qw/Uploader::Object/;
-use Image::Magick;
-use Data::Dumper;
-
-$|=1;
+use base qw/Uploader::ThreadManager/;
+use Uploader::ResizeWorker;
 
 __PACKAGE__->mk_accessors(qw/
+    wx_thumb_dir
     preferences
-    wx_thumb_dir
-    site_thumb_dir
-    site_resized_dir
-    write_type
-    progress_event
-    done_event
-    event_handler
-    cancel_event
 /);
 
 
-sub Init {
+sub new_worker {
     my ( $self ) =@_;
 
+
+    Uploader::ResizeWorker->new({
+        thumb_dir    => $self->thumb_dir,
+        wx_thumb_dir => $self->wx_thumb_dir,
+        resized_dir  => $self->resized_dir,
+        preferences  => $self->preferences,
+        write_type   => 'jpg',
+    });
 }
 
 
-sub cancel_image {
-    my ( $self, $image ) = @_;
-    
-    #must check if $image is a valid hash
-    return unless 'HASH' eq ref $image;
-    return unless $image->{image_id};
-
-    $self->log_image_progress(
-        $image,
-        "cancelled",
-        0,
-    );
-}
-
-
-sub process_image {
-    my ( $self, $handler, $progress_event, $resize_done_event, $image ) = @_;
-
-    $self->event_handler(
-        $handler
-    );
-
-
-    $self->progress_event(
-        $progress_event
-    );
-
-    $self->done_event(
-        $resize_done_event
-    );
-
-    $self->resize_image($image);
-    $self->process_high_image($image);
-    $self->thumbnail_image($image);
-
-    $self->post_image_done_event($image);
-}
-
-
-sub post_image_progress_event {
-    my ( $self, $image ) = @_;
-
-    $self->post_image_event(
-        $self->progress_event,
-        $image
-    );
-}
-
-
-sub post_image_done_event {
-    my ( $self, $image ) = @_;
-
-    $image->{status}   = "prepared, waiting for transfer";
-    $image->{progress} = 25;
-
-    $self->post_image_event(
-        $self->done_event,
-        $image
-    );
-}
-
-
-sub post_image_cancel_event {
-    my ( $self, $image ) = @_;
-
-    $image->{status}   = "cancelled";
-    $image->{progress} = 0;
-
-    $self->post_image_event(
-        $self->cancel_event,
-        $image
-    );
-}
-
-
-sub post_image_event {
-    my ( $self, $event_type, $image ) = @_;
-
-    my $thread_event = Wx::PlThreadEvent->new(
-        -1,
-        $event_type,
-        shared_clone($image)
-    );
-    Wx::PostEvent($self->event_handler, $thread_event);
-}
-
-
-sub resize_image {
-    my ( $self, $image ) = @_;
-
-    $self->log_image_progress(
-        $image,
-        "creating web size",
-        5,
-    );
-
-    my $preferences = $image->{preferences};
-
-    if( $preferences->{create_resized} ){
-        $self->create_resized($image);
-    }
-    # the original is at the right size, no need to create a resize
-    else {
-        #printf("original no resized %s\n", $self->create_resized);
-        $image->{site_resized_file} = $image->{file};
-    }
-
-    $self->log_image_progress(
-        $image,
-        "web size created",
-        10,
-    );
-
-}
-
-
-sub log_image_progress {
-    my ( $self, $image, $status, $value ) = @_;
-
-    $image->{status}   = $status;
-    $image->{progress} = $value;
-    $self->post_image_progress_event($image);
-}
-
-
-sub process_high_image {
-    my ( $self, $image ) = @_;
-
-    my $decode = {
-        'No' => 0,
-        'Yes, use HD resized of the original photo' => 'HD',
-        'Yes, use a copy of the original photo' => 'ORIGINAL',
-    };
-
-    my $preferences = $image->{preferences};
-    $image->{upload_high} = $decode->{$preferences->{upload_hd}};
-    # if upload high, rotate a copy of original file
-    if($image->{upload_high}){
-        $self->create_high($image);
-    }
-}
-
-
-# $image is a hash, not an object
-sub create_resized {
-    my ( $self, $image ) = @_;
-
-    my $rval = 1 ;
-
-    $image->{site_resized_file} = File::Spec->catfile(
-        $self->site_resized_dir,
-        sprintf(
-            "%s.%s.%s",
-            $image->{image_id},
-            $image->{global_rank},
-            $self->write_type,
-        ),
-    );
-
-    my $imgk = new Image::Magick;
-
-    my $status = $imgk->ReadImage(
-        $image->{file}
-    );
-    warn "$status" if $status ;
-    return 0 if $status;
-
-    my $w = $imgk->Get('width');
-    my $h = $imgk->Get('height');
-
-    $status = $imgk->Set(Gravity=>"Center");
-    warn "$status" if $status ;
-
-    # exif from original image
-    my $orientation = $image->{exif_metadata}{Orientation};
-    my $preferences = $image->{preferences};
-    
-    # Valid for Rotate 180, Rotate 90 CW, Rotate 270 CW
-    if( $orientation =~ m/Rotate (\d+)/ ){
-        printf(
-            "Rotate %s\n",
-            $1
-        );
-    
-        $imgk->Rotate( degrees=>$1 ) if $preferences->{auto_rotate};    
-    }
-
-
-    #printf("resize with blur value %s\n", $self->blur);
-    $status = $imgk->Resize(
-        geometry => sprintf(
-            "%sx%s>",
-            $preferences->{resize_w},
-            $preferences->{resize_h}
-        ),
-        filter => sprintf(
-            "%s",
-            $preferences->{filter}
-        ), 
-        blur => $preferences->{blur}
-    );
-    warn "$status" if $status ;
-    return 0 if $status;
-
-    #printf("resize with quality value %s\n", $self->quality);
-    $status = $imgk->Set(quality=>$preferences->{quality});
-    warn "$status" if $status ;
-
-    $status = $imgk->Set(interlace=>$preferences->{interlace});
-    warn "$status" if $status ;
-
-    $imgk->Write(
-        sprintf(
-            "%s:%s",
-            $self->write_type,
-            $image->{site_resized_file},
-        )
-    );
-    warn "$status" if $status ;
-    return 0 if $status;
-    
-    undef $imgk;
-
-   
-    $rval = 0 if $status;
-
-    return $rval;
-}
-
-# $image is a hash, not an object
-sub thumbnail_image {
-    my ( $self, $image ) = @_;
-    
-    my $rval = 1;
-
-    $image->{site_thumb_file} = File::Spec->catfile(
-        $self->site_thumb_dir,
-        sprintf(
-            "%s.%s.%s",
-            $image->{image_id},
-            $image->{global_rank},
-            $self->write_type,
-        ),
-    );
-
-
-    my $imgk = new Image::Magick;
-
-    my $status = $imgk->ReadImage(
-        $image->{site_resized_file}
-    );
-    warn "$status" if $status ;
-
-    my $preferences = $image->{preferences};
-    my $pattern = $preferences->{thumbnail_shape_square} ?
-        "%sx%s^" :
-        "%sx%s>" ;
-    $status = $imgk->Resize(
-        geometry => sprintf(
-            $pattern, 
-            $preferences->{thumb_size}, 
-            $preferences->{thumb_size}
-        ),
-    );
-    warn "$status" if $status ;
-
-    $status = $imgk->Set(Gravity=>"Center");
-    warn "$status" if $status ;
-
-    $status = $imgk->Crop(
-        geometry=>sprintf(
-            "%sx%s+0+0",
-            $preferences->{thumb_size},
-            $preferences->{thumb_size}
-        )
-    ) if $preferences->{thumbnail_shape_square};
-
-
-    $status = $imgk->Set(quality=>$preferences->{th_quality});
-    warn "$status" if $status ;
-
-    $status = $imgk->Strip();
-    warn "$status" if $status ;
-
-
-    $imgk->Write(
-        sprintf(
-            "%s:%s",
-            $self->write_type,
-            $image->{site_thumb_file},
-        )
-    );
-    
-    undef $image;
-
-
-    $rval = 0 if $status;
-
-    return $rval;
-}
-
-
-sub create_high {
-    my ( $self, $image ) = @_;
-
-    $self->log_image_progress(
-        $image,
-        "preparing high",
-        15,
-    );
-
-    $self->set_site_high_file($image);
-
-    my $bModifyOriginal;
-    my $bRotate;
-    my $bAddWatermark;
-    my $bResize;
-    my $orientation = $image->{exif_metadata}{Orientation};
-    my $degrees;
-    
-    my $preferences = $image->{preferences};
-    # Valid for Rotate 180, Rotate 90 CW, Rotate 270 CW
-    if( $preferences->{auto_rotate} and $orientation =~ m/Rotate (\d+)/ ){
-        $bModifyOriginal = 1;
-        $bRotate = 1;
-        $degrees = $1;
-    }
-
-    if( $preferences->{watermark_activate_pwg_high} ){
-        $bModifyOriginal = 1;
-        $bAddWatermark = 1;
-    }
-    
-    # HD resize
-    if('HD' eq $image->{upload_high}){
-        $bModifyOriginal = 1;
-        $bResize = 1;
-    }
-
-    if($bModifyOriginal){
-
-        my $imgk = Image::Magick->new();
-        # we read original
-        my $status = $imgk->Read(
-            $image->{file}
-        );
-        warn "$status ", $image->{file}, "\n" if $status ;
-        return 0 if $status;
-
-        if($bRotate){
-            $imgk->Rotate( degrees=>$degrees );    
-        }        
-        $imgk->Write(
-            $image->{site_high_file}
-        );
-        warn "$status ", $image->{site_high_file}, "\n" if $status ;
-        return 0 if $status;
-
-        if($bResize){
-            $status = $imgk->Resize(
-                geometry => sprintf(
-                    "%sx%s>",
-                    $preferences->{hd_w},
-                    $preferences->{hd_h}
-                ), 
-                filter => sprintf(
-                    "%s",
-                    $preferences->{hd_filter}
-                ), 
-                blur => $preferences->{hd_blur}
-            );
-            warn "$status" if $status ;
-            return 0 if $status;
-        }
-        
-        #printf("resize with quality value %s\n", $self->quality);
-        $status = $imgk->Set(quality=>$preferences->{quality});
-        warn "$status" if $status ;
-
-        $status = $imgk->Set(interlace=>$preferences->{interlace});
-        warn "$status" if $status ;
-        
-        
-        undef $imgk;
-
-        if($bAddWatermark){
-            my $file_out = $image->{site_high_file};
-            $self->create_watermark(
-                $preferences->{watermark_text},
-                $preferences->{watermark_text_size},
-                $preferences->{watermark_position},
-                $preferences->{watermark_x},
-                $preferences->{watermark_y},
-                $preferences->{watermark_color},
-                $file_out
-            );
-        }
-
-        $self->set_file_exif_tag(
-            $image->{site_high_file},
-            'Orientation',
-            'Horizontal (normal)',
-        );
-
-        # Now all images that need to be rotated are done. Update exif
-        $image->{exif_metadata}{Orientation} = 'Horizontal (normal)';
-
-
-    }
-    else{
-        # high file is the original file
-        $image->{site_high_file} = $image->{file};
-        #printf("site high file %s\n", $self->current_image->site_high_file);
-    }
-    $self->log_image_progress(
-        $image,
-        "high prepared",
-        25,
-    );
-
-    return 1;
-
-}
-
-
-sub set_site_high_file {
-    my ( $self, $image ) = @_;
-
-    my ( $vol, $dir, $file ) = File::Spec->splitpath(
-        $image->{file}
-    );
-    
-    my ( $filename, $ext ) = split /\./, $file ;
-    
-    # high_file is a resized of original
-    $image->{site_high_file} = File::Spec->catfile(
-        $self->site_resized_dir,
-        sprintf(
-            "%s_high.%s.%s",
-            $image->{image_id},
-            $image->{global_rank},
-            $self->write_type,
-        ),
-    );
-}
-
-
-sub set_file_exif_tag {
-    my ( $self, $file, $tag, $newValue ) = @_;    
-
-    my $options = {};
-    # Create a new Image::ExifTool object
-    my $exifTool = new Image::ExifTool;
-
-    # Extract meta information from an image
-    $exifTool->ExtractInfo($file, $options);
-
-    # Set a new value for a tag
-    $exifTool->SetNewValue($tag, $newValue);
-
-    # Write new meta information to a file
-    $exifTool->WriteInfo($file);
-
-}
-
-
-# used for display in GUI. has to fit a square box ( wxImageList )
-# $image is an object
 sub create_wx_thumbnail {
     my ( $self, $image ) = @_;
 
-
-    $image->wx_thumb_file( 
-        File::Spec->catfile(
-            $self->wx_thumb_dir,
-            sprintf(
-                "%s.%s.%s",
-                $image->image_id,
-                $image->global_rank,
-                $self->write_type,
-            ),
-        )
-    );
-
-
-    my $rval = 0;
-    my $imgk = new Image::Magick;
-
-    my $preferences = $image->{preferences};
-    my $size = $preferences->{wx_thumb_size}||100;
-
-    my $status = $imgk->Set(size=>sprintf("%sx%s", 2*$size, 2*$size));
-    warn "$status" if $status ;
-
-    $status = $imgk->ReadImage(
-        $image->file
-    );
-    warn "$status" if $status;
-    return $rval if $status;
-
-    # maximize size and keep aspect ratio
-    $status = $imgk->Thumbnail(
-        geometry=>sprintf("%s%s>", $size*$size, '@')
-    );
-    # to get adjusted to a square box
-    #$status = $image->Thumbnail(
-    #    geometry=>sprintf("%sx%s%s", $size, $size, '^')
-    #);
-    warn "$status" if $status;
-    return $rval if $status;
-
-    $status = $imgk->Set(Gravity=>"Center");
-    warn "$status" if $status ;
-
-    $imgk->Extent(
-        geometry=>sprintf("%sx%s", $size, $size),
-        gravity=>'center',
-    );
-    
-    $imgk->Set(
-        quality=>$preferences->{wx_quality}||90
-    );
-
-    $status = $imgk->Strip();
-    warn "$status" if $status ;
-
-    # exif from original image
-    my $orientation = $image->exif_metadata->{Orientation};
-    
-    # Valid for Rotate 180, Rotate 90 CW, Rotate 270 CW
-    if( $orientation =~ m/Rotate (\d+)/ ){
-        printf(
-            "Rotate %s\n",
-            $1
-        );
-    
-        $imgk->Rotate( degrees=>$1 ) if $preferences->{auto_rotate};    
-    }
-    
-
-    $imgk->Write(
-        sprintf(
-            "%s:%s",
-            $self->write_type,
-            $image->wx_thumb_file,
-        )
-    );
-
-    undef $imgk;
-    
-    $rval = 1;
-    
-    return $rval;
+    $self->worker->create_wx_thumbnail($image);
 }
 

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

@@ -2 +2 @@
 use threads;
 use threads::shared;
+use Thread::Queue;
 use strict;
-use base qw/Uploader::Object/;
-use Data::Dumper;
-use Digest::MD5::File qw/file_md5_hex md5_hex/;
-
-$|=1;
-
+use base qw/Uploader::ThreadManager/;
+use Uploader::TransferWorker;
+use vars qw/$AUTOLOAD/;
 __PACKAGE__->mk_accessors(qw/
-    preferences
-    site_thumb_dir
-    site_resized_dir
-    write_type
-    destination_category
     pwg
-    event_handler
-    progress_event
-    done_event
 /);
 
 
-sub Init {
+sub new_worker {
     my ( $self ) =@_;
 
-    $self->destination_category([]);
-    $self->pwg->log_progress_cbk(
-        sub { $self->post_image_progress_event(@_) }
-    );
-}
 
-
-sub cancel_image {
-    my ( $self, $image ) = @_;
-
-    #must check if $image is a valid hash
-    return unless 'HASH' eq ref $image;
-    return unless $image->{image_id};
-
-    $self->log_image_progress(
-        $image,
-        "cancelled",
-        0,
-    );
-}
-
-
-sub process_image {
-    my ( $self, $handler, $progress_event, $transfer_done_event, $image) = @_;
-
-    $self->event_handler(
-        $handler
-    );
-
-
-    $self->progress_event(
-        $progress_event
-    );
-
-    $self->done_event(
-        $transfer_done_event
-    );
-
-
-    if(!$self->exists_image($image)){
-        $self->insert_image($image);
-    }
-    else {
-        $self->update_image($image);
-    }
+    Uploader::TransferWorker->new({
+        pwg => $self->pwg,
+    });
 
 }
 
 
-sub exists_image {
-    my ( $self, $image ) = @_;
+sub destination_category {
+    my ( $self, $category ) = @_;
 
-    $self->pwg->exists_image(
-        $image
-    );
-}
-
-
-sub insert_image {
-    my ( $self, $image ) = @_;
-
-    $self->log_image_progress($image, "sending files", 0);
-    $self->add_image_files($image);
-    $self->add_image($image);
-    $self->log_image_progress($image, "transfered", 100);
-
-}
-
-
-sub log_image_progress {
-    my ( $self, $image, $status, $value ) = @_;
-
-    $image->{status}   = $status;
-    $image->{progress} = $value;
-    $self->post_image_progress_event($image);
-}
-
-
-sub add_image_files {
-    my ( $self, $image ) = @_;
-
-    $self->init_image_files_checksums($image);
-    $self->send_image_files_chunks($image);
-}
-
-
-sub init_image_files_checksums {
-    my ( $self, $image ) = @_;
-
-
-    $self->log_image_progress($image, "check files", 0);
-    my @file_types = ('site_resized_file', 'site_thumb_file');
-    push @file_types, 'site_high_file' if $image->{upload_high};
-
-    map {
-        $self->init_image_file_type_checksum($image, $_)
-    }@file_types;
-
-    $self->log_image_progress($image, "files checked", 100);
-}
-
-
-sub init_image_file_type_checksum {
-    my ( $self, $image, $file_type ) = @_;
-
-    my $file = $image->{$file_type};
-    $image->{"$file_type"."_checksum"} = $self->checksum($file);
-}
-
-
-sub checksum {
-    my ( $self, $file ) = @_;
-
-    my $file_sum;
-
-    eval {
-        $file_sum = file_md5_hex(
-            $file
-        );
-    };
-
-    $file_sum;
-}
-
-
-sub send_image_files_chunks {
-    my ( $self, $image ) = @_;
-
-    $self->pwg->send_image_files_chunks(
-        $image
-    );
-}
-
-
-sub add_image {
-    my ( $self, $image ) = @_;
-
-    $self->pwg->add_image($image);
-}
-
-
-sub update_image {
-    my ( $self, $image ) = @_;
-
-    $self->log_image_progress($image, "updating", 0);
-
-    $self->update_image_files($image);
-    $self->update_image_properties($image);
-
-    $self->log_image_progress($image, "updated", 100);
-}
-
-
-sub update_image_files {
-    my ( $self, $image ) = @_;
-
-    if($image->{preferences}{reupload_action_files}){
-        $self->log_image_progress($image, "updating files", 0);
-        $self->init_image_files_checksums($image);
-        $self->update_image_modified_files($image);
-        $self->log_image_progress($image, "files updated", 100);
-    }
-}
-
-
-sub update_image_modified_files {
-    my ( $self, $image ) = @_;
-
-    $self->pwg->update_image_modified_files($image);
-}
-
-
-sub update_image_properties {
-    my ( $self, $image ) = @_;
-
-    $self->log_image_progress($image, "updating properties", 0);
-    $self->pwg->update_image_properties($image);
-    $self->log_image_progress($image, "properties updated", 100);
-}
-
-
-sub post_image_progress_event {
-    my ( $self, $image ) = @_;
-
-    $self->post_image_event(
-        $self->progress_event,
-        $image
-    );
-}
-
-
-sub post_image_event {
-    my ( $self, $event_type, $image ) = @_;
-
-    my $thread_event = Wx::PlThreadEvent->new(
-        -1,
-        $event_type,
-        shared_clone($image)
-    );
-    Wx::PostEvent($self->event_handler, $thread_event);
+    $self->worker->destination_category($category);
 }
 
@@ -231 +33 @@
     my ( $self ) = @_;
 
-    !scalar @{$self->destination_category};
+    $self->worker->destination_category_is_empty;
 }