Changeset 18555 for gsdl/trunk/perllib/convertutil.pm

Timestamp:

2009-02-20T11:04:15+13:00 (15 years ago)

Author:

davidb

Message:

General tidy up of code for supporting cached files. The generate_cached_images plugin option has been changed to enable_cache as this makes more sense for the other media formats we are begining to support, such as audio and video

File:

• gsdl/trunk/perllib/convertutil.pm (modified) (5 diffs)

gsdl/trunk/perllib/convertutil.pm

@@ -99 +99 @@
     # Default are provided for these monitor functions if none specified
 
+
     my $verbosity = $options->{'verbosity'};
     my $outhandle = $options->{'outhandle'};
@@ -257 +258 @@
     my ($command,$ofilename,$options) = @_;
 
+    my $outhandle = $options->{'outhandle'};
+    my $verbosity = $options->{'verbosity'};
+    my $message_prefix = $options->{'message_prefix'};
+
     my $regenerated = 0;
     my $result = "";
     my $had_error = 0;
+
+    my $args_filename = "$ofilename.args";
 
     if (!-e $ofilename) {
@@ -265 +272 @@
         = regenerate_general_cmd($command,$ofilename,$options);
     }
+    elsif (-M $ofilename > -M $args_filename) {
+    # Source files has been updated/changed in some way
+    # => regenerate
+    print $outhandle "$ofilename modified more recently than cached version\n";
+
+    ($regenerated,$result,$had_error) 
+        = regenerate_general_cmd($command,$ofilename,$options); 
+    }
     else {
     # file exists => check to see if command to generate it has changed
-    my $args_filename = "$ofilename.args";
+
     if (open (ARGSIN,"<$args_filename")) {
         my $prev_command = <ARGSIN>;
@@ -282 +297 @@
         }
         else {
-            my $outhandle = $options->{'outhandle'};
-            my $verbosity = $options->{'verbosity'};
-
-            my $message_prefix = $options->{'message_prefix'};
-
             my ($ofile) = ($ofilename =~ m/^.*(cached.*)$/);
 
@@ -310 +320 @@
     }
     else {
-        my $outhandle = $options->{'outhandle'};
-        my $message_prefix = $options->{'message_prefix'};
-        
         print $outhandle "  $message_prefix: No cached previous args found.  Regenerating $ofilename\n";