Changeset 6707 for extensions/pLoader/trunk/src/Uploader/Images.pm

Timestamp:

Jul 26, 2010, 11:21:44 AM (14 years ago)

Author:

ronosman

Message:

use tranfer error messages in progress list. various bug fixes.

File:

• extensions/pLoader/trunk/src/Uploader/Images.pm (modified) (10 diffs)

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

@@ -31 +31 @@
     author
     type
+    global_rank
+    global_rank_indx
 /;
 
@@ -37 +39 @@
 /;
 
+my @tmp_properties = qw/
+    to_be_removed_grank
+/;
+
+
 __PACKAGE__->mk_accessors(@cbk_properties);
 __PACKAGE__->mk_accessors(@storable_properties);
 __PACKAGE__->mk_accessors(@app_properties);
-
-my $_global_rank = -1;
+__PACKAGE__->mk_accessors(@tmp_properties);
+
 
 sub Init {
@@ -49 +56 @@
     $self->ordered_image_ids([]) if !defined $self->ordered_image_ids;
     $self->selection([]) if !defined $self->selection;
+    $self->global_rank(-1) if !defined $self->global_rank;
+    $self->global_rank_indx({}) if !defined $self->global_rank_indx;
+    $self->to_be_removed_grank([]) if !defined $self->to_be_removed_grank;
 }
 
@@ -90 +100 @@
     $self->ordered_image_ids->[$i] = $image_id ;
 
+    $self->global_rank(
+        1+$self->global_rank
+    );
+
+    $self->global_rank_indx->{
+        $self->global_rank
+    } = $i;
 
     my $image = $self->_images->{
@@ -104 +121 @@
                 site_tags         => [],
                 site_high_file    => $file->{ANSIPathName},
-                global_rank       => ++$_global_rank,
+                global_rank       => $self->global_rank,
             }
         );
@@ -176 +193 @@
     my ( $self, $indx ) = @_;
     
+    return unless defined $indx;
     my $id = $self->ordered_image_ids->[$indx];
 
@@ -222 +240 @@
 
 
+sub remove_processed {
+    my ( $self ) = @_;
+    
+    return if ( $self->is_empty );
+    return if (! defined $self->to_be_removed_grank );
+
+    my $to_remove_indx = [];
+    # check if the global rank correspond
+    # the image may have changed
+    foreach(@{$self->to_be_removed_grank}) {
+        my $indx = $self->global_rank_indx->{$_};
+        my $img;
+        if(defined $indx){
+            $img = $self->get_image($indx);
+        }
+        if(defined $img){
+            push @$to_remove_indx, $indx if
+                $img->global_rank == $_;
+        }
+    } 
+
+    $self->_remove_selection($to_remove_indx);
+    # clear image selection
+    $self->to_be_removed_grank([]);
+}
+
+
 sub _remove_selection {
     my ( $self, $list ) = @_;
+    printf("_remove_selection %s\n", Dumper $list);
     # the list is sorted, ascendant
     # we reverse it to have
@@ -238 +284 @@
 }
 
+
+# postpone actual removal.
+sub set_to_be_removed {
+    my ( $self, $global_rank ) = @_;
+
+    push @{$self->to_be_removed_grank}, $global_rank;
+}
+
+
 sub delete_image {
     my ( $self, $indx ) = @_;
@@ -245 +300 @@
     # have to check if that id is used more than once
     my $count = grep { $id eq $_} @{$self->ordered_image_ids};
+
+    # global rank is unique
+    delete $self->global_rank_indx->{
+        $self->_images->{$id}->global_rank
+    };
 
     delete $self->_images->{$id} unless $count > 1;
@@ -517 +577 @@
 
 
+# when the progress list is cleared
 sub reset_add_rank {
     my ( $self ) = @_;