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

Timestamp:

2008-02-04T13:18:55+13:00 (16 years ago)

Author:

mdewsnip

Message:

All calls to convert now go through one "convert()" function, in preparation for adding image caching.

File:

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

gsdl/trunk/perllib/plugins/ImagePlug.pm

@@ -164 +164 @@
     $self->{'tmp_filename'} = $filename;
 
-    my $command = "convert -interlace plane -verbose \"$originalfilename\" \"$filename\"";
-    print $outhandle "$command\n" if ($verbosity > 2);
-    my $result = '';
-    $result = `$command`;
-    print $outhandle "RESULT = $result\n" if ($verbosity > 2);
+    my $result = $self->convert($originalfilename, $filename, "", "");
 
     $type = $converttotype;
@@ -222 +218 @@
 
     # Generate the thumbnail with convert
-    my $command = "convert -interlace plane -verbose -geometry $thumbnailsize" 
-    . "x$thumbnailsize \"$filename\" \"$thumbnailfile\"";
-    print $outhandle "THUMBNAIL: $command\n" if ($verbosity > 2);
-    my $result = '';
-    $result = `$command 2>&1` ;
-    print $outhandle "THUMB RESULT: $result\n" if ($verbosity > 2);
+    my $result = $self->convert($filename, $thumbnailfile, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
 
     # Add the thumbnail as an associated file ...
@@ -257 +248 @@
 
     # make the screenview image
-    my $command = "convert -interlace plane -verbose -geometry $screenviewsize" 
-        . "x$screenviewsize \"$filename\" \"$screenviewfilename\"";
-    print $outhandle "$command\n" if ($verbosity > 2);
-    my $result = "";
-    $result = `$command  2>&1` ;
-    print $outhandle "$result\n" if ($verbosity > 3);
+    my $result = $self->convert($filename, $screenviewfilename, "-geometry $screenviewsize" . "x$screenviewsize", "SCREEN");
 
     # get screenview dimensions, size and type
@@ -338 +324 @@
     # Return the specs
     return ($type, $width, $height, $size);
+}
+
+
+sub convert
+{
+    my $self = shift(@_);
+    my $source_file_path = shift(@_);
+    my $target_file_path = shift(@_);
+    my $convert_options = shift(@_) || "";
+    my $convert_type = shift(@_) || "";
+
+    my $outhandle = $self->{'outhandle'};
+    my $verbosity = $self->{'verbosity'};
+
+    my $convert_command = "convert -interlace plane -verbose $convert_options \"$source_file_path\" \"$target_file_path\"";
+    print $outhandle "$convert_type $convert_command\n" if ($verbosity > 2);
+    my $result = `$convert_command 2>&1`;
+    print $outhandle "$convert_type RESULT = $result\n" if ($verbosity > 2);
+
+    return $result;
 }