Changeset 14952 for gsdl/trunk/perllib/plugins/ImagePlug.pm

Timestamp:

2008-02-04T13:28:52+13:00 (16 years ago)

Author:

mdewsnip

Message:

Tidied up the code for cleaning up the temporary files, in preparation for adding image caching.

File:

• gsdl/trunk/perllib/plugins/ImagePlug.pm (modified) (6 diffs)

gsdl/trunk/perllib/plugins/ImagePlug.pm

@@ -96 +96 @@
 
     my $self = new BasPlug($pluginlist, $inputargs, $hashArgOptLists);
+    $self->{'tmp_file_paths'} = ();
 
     # Check that ImageMagick is installed and available on the path (except for Windows 95/98)
@@ -162 +163 @@
     $originalfilename = $filename;
     $filename = &util::get_tmp_filename() . ".$converttotype";
-    $self->{'tmp_filename'} = $filename;
 
     my $result = $self->convert($originalfilename, $filename, "", "");
@@ -215 +215 @@
     
     my $thumbnailfile = &util::get_tmp_filename() . ".$thumbnailtype";
-    $self->{'tmp_filename2'} = $thumbnailfile;
 
     # Generate the thumbnail with convert
@@ -245 +244 @@
     my $screenviewtype = $self->{'screenviewtype'} || 'jpeg';
     my $screenviewfilename = &util::get_tmp_filename() . ".$screenviewtype";
-    $self->{'tmp_filename3'} = $screenviewfilename;
 
     # make the screenview image
@@ -342 +340 @@
     my $result = `$convert_command 2>&1`;
     print $outhandle "$convert_type RESULT = $result\n" if ($verbosity > 2);
+
+    push(@{$self->{'tmp_file_paths'}}, $target_file_path);
 
     return $result;
@@ -438 +438 @@
     # generate_images becuase associated files aren't actually copied 
     # until after process has been run.
-    if (defined $self->{'tmp_filename'} && 
-    -e $self->{'tmp_filename'}) {
-      &util::rm($self->{'tmp_filename'})
-    }
-
-    if (defined $self->{'tmp_filename2'} && 
-    -e $self->{'tmp_filename2'}) {
-      &util::rm($self->{'tmp_filename2'})
-    }
-    if (defined $self->{'tmp_filename3'} && 
-    -e $self->{'tmp_filename3'}) {
-      &util::rm($self->{'tmp_filename3'})
+    foreach my $tmp_file_path (@{$self->{'tmp_file_paths'}})
+    {
+    if (-e $tmp_file_path)
+    {
+        &util::rm($tmp_file_path);
+    }
     }