Changeset 617

Timestamp:

03/12/07 19:03:47 (6 years ago)

Author:

lincoln

Message:

better behavior for frequent calling of shepherd - still whinge at the user for calling shepherd too frequently, but still give them output based on previously-generated (cached) output XMLTV

Files:

• applications/shepherd (modified) (5 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.82';
+my $version = '0.4.83';
 
 # tv_grab_au
@@ -890 +890 @@
 
     if (defined $opt->{notimetest}) {
-        &log(2, "Allowing operation due to '--notimetest' override but\n".
+        &log(2, "Allowing normal operation due to '--notimetest' override but\n".
                 "please don't make a habit of this.\n\n");
         return;
     }
 
-    &log(2, "Please don't run ".ucfirst($progname)." so frequently.\n\n".
-        "If you are experimenting/testing and really mean to run ".ucfirst($progname).", do so using\n".
-        "the --notimetest setting but please don't make a habit of this.\n");
-
-    &countdown(10, "Aborting");
-    exit(1);
+    &log(2, "Please don't run ".ucfirst($progname)." so frequently.\n".
+        "Re-using (existing cached) output for this run.\n\n".
+        "If you are experimenting/testing and really want ".ucfirst($progname)." to fetch fresh data,\n".
+        "do so using the --notimetest setting but please don't make a habit of this.\n\n");
+
+    &countdown(10);
+
+    &output_data(1);
+    exit(0);
 }
 
@@ -1849 +1852 @@
         exit 0;
     }
+    $last_successful_run = undef;
 
     write_config_file();
@@ -3890 +3894 @@
 sub output_data
 {
-    # $input_postprocess_file contains our final output
-    # send it to whereever --output told us to!
-
+    my $reuse_cached_output = shift;
+    $reuse_cached_output = 0 if (!defined $reuse_cached_output);
+    
+    my $output_cache_copy = "$CWD/output.xmltv";
     my $output_filename = "$CWD/output.xmltv";
     $output_filename = $opt->{output} if ($opt->{output});
+
+    if ($reuse_cached_output) {
+        # re-use existing cached output
+        $input_postprocess_file = $output_cache_copy;
+
+        if ($output_filename eq $input_postprocess_file) {
+            # nothing to do - the input is the same as the output
+            &log("Re-using existing output $output_filename\n");
+            return;
+        }
+    }
 
     my %writer_args = ( encoding => 'ISO-8859-1' );
@@ -3911 +3927 @@
 
     &log("Final output stored in $output_filename.\n");
+
+    # copy final output to our cache copy as well
+    if ($output_filename ne $output_cache_copy) {
+        unlink($output_cache_copy);
+        open(F1,"<$output_filename");
+        open(F2,">$output_cache_copy");
+        while (<F1>) {
+            print F2 $_;
+        }
+        close(F1);
+        close(F2);
+    }
+    &log("Cached output stored in $output_cache_copy.\n");
 }
 

status

@@ -1 @@
-application     shepherd            0.4.82
+application     shepherd            0.4.83
 grabber         yahoo7widget        1.81
 grabber         rex                 3.4.6