Changeset 16825

Timestamp:

2008-08-15T15:33:36+12:00 (16 years ago)

Author:

davidb

Message:

Code for supporting cache merged back in with Katherine's restructured plugins

File:

• gsdl/trunk/perllib/plugins/ImageConverter.pm (modified) (8 diffs)

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -26 +26 @@
 package ImageConverter;
 
-use PrintInfo;
+use MediaConverter;
+
 
 use strict;
@@ -34 +35 @@
 
 BEGIN {
-    @ImageConverter::ISA = ('PrintInfo');
+    @ImageConverter::ISA = ('MediaConverter');
 }
 
@@ -111 +112 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
+    my $self = new MediaConverter($pluginlist, $inputargs, $hashArgOptLists, 1);
+
 
     return bless $self, $class;
@@ -163 +165 @@
     return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
 
+    if ($self->{'cache_generated_images'}) {
+    $self->init_cache_for_file($filename_full_path);
+    }
+
     my $verbosity = $self->{'verbosity'};
     my $outhandle = $self->{'outhandle'};
@@ -195 +201 @@
     #    $doc_obj->add_utf8_metadata($section, "Image", $utf8_filename_meta);
 
-    my $result = $self->convert($filename_full_path, $converttotype, "", "");
-    ($filename_full_path) = ($result =~ /=>(.*\.$converttotype)/);
+    my ($result,$filename_full_path) 
+        = $self->convert($filename_full_path, $converttotype, "", "CONVERTTYPE");
 
     $type = $converttotype;
@@ -250 +256 @@
     
     # Generate the thumbnail with convert
-    my $result = $self->convert($original_file, $thumbnailtype, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
-    my ($thumbnailfile) = ($result =~ /=>(.*\.$thumbnailtype)/);
+    my ($result,$thumbnailfile) 
+    = $self->convert($original_file, $thumbnailtype, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
     
     # Add the thumbnail as an associated file ...
@@ -288 +294 @@
     
     # make the screenview image
-    my $result = $self->convert($original_file, $screenviewtype, "-geometry $screenviewsize" . "x$screenviewsize", "SCREEN");
-    my ($screenviewfilename) = ($result =~ /=>(.*\.$screenviewtype)/);
-    
+    my ($result,$screenviewfilename) 
+    = $self->convert($original_file, $screenviewtype, "-geometry $screenviewsize" . "x$screenviewsize", "SCREEN");    
     
     #add the screenview as an associated file ...
@@ -323 +328 @@
     my $source_file_path = shift(@_);
     my $target_file_type = shift(@_);
-    my $convert_options = shift(@_) || "";
-    my $convert_type = shift(@_) || "";
+    my $convert_options  = shift(@_) || "";
+    my $convert_id       = shift(@_) || "";
 
     my $outhandle = $self->{'outhandle'};
     my $verbosity = $self->{'verbosity'};
 
+    my $source_file_no_path = &File::Basename::basename($source_file_path);
+
     # Determine the full name and path of the output file
-    my $target_file_path = &util::get_tmp_filename($target_file_type);
-    push(@{$self->{'tmp_file_paths'}}, $target_file_path);
+    my $target_file_path;
+    if ($self->{'cache_generated_images'}) {
+    my $cached_image_dir = $self->{'cached_dir'};
+    my $image_root = $self->{'cached_file_root'};
+    $image_root .= "_$convert_id" if ($convert_id ne "");
+    my $image_file = "$image_root.$target_file_type";
+    $target_file_path = &util::filename_cat($cached_image_dir,$image_file);
+    }
+    else {
+    $target_file_path = &util::get_tmp_filename($target_file_type);
+    push(@{$self->{'tmp_file_paths'}}, $target_file_path);
+
+    # Output filename used to be parsed from result line:
+    #   my ($ofilename) = ($result =~ m/=>(.*\.$target_file_type)/);
+    # by the function that called 'convert'
+    # but this is no longer needed, as output filename is now
+    # explicitly passed back
+
+    }
 
     # Generate and run the convert command
     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;
+
+    my $print_info = { 'message_prefix' => $convert_id,
+               'message' => "Converting image $source_file_no_path to: $convert_id $target_file_type" };
+ 
+    my ($regenerated,$result,$had_error) 
+    = $self->autorun_general_cmd($convert_command,$target_file_path,$print_info);
+
+    return ($result,$target_file_path);
 }