Changeset 431

Timestamp:

01/09/07 16:50:19 (6 years ago)

Author:

lincoln

Message:

convert reconciler_mk2 to Storable

Files:

• reconcilers/reconciler_mk2 (modified) (9 diffs)
• status (modified) (1 diff)

reconcilers/reconciler_mk2

@@ -95 +95 @@
 
 my $progname = "reconciler_mk2";
-my $version = "0.18";
+my $version = "0.19";
 
 use LWP::UserAgent;
@@ -104 +104 @@
 use Data::Dumper;
 use Compress::Zlib;
+use Storable;
 
 #### reconciler settings ####
@@ -219 +220 @@
 my $opt = { };
 $opt->{output_file} =           "output.xmltv";
-$opt->{config_file} =           $progname.".config";
+$opt->{old_config_file} =       $progname.".config";
+$opt->{config_file} =           $progname.".storable.config";
 $opt->{log_file} =              $progname.".log";
 $opt->{alt_title_file} =        $progname.".alt_title.log";
@@ -232 +234 @@
         'channels_file=s'       => \$opt->{channels_file},
         'preftitle=s'           => \$opt->{preftitle},
+        'old-config-file=s'     => \$opt->{old_config_file},
         'config-file=s'         => \$opt->{config_file},
         'log=s'                 => \$opt->{log_file},
@@ -243 +246 @@
 
         'print_listing'         => \$reclogic{debug_print_programme_list},
+        'dump_config'           => \$opt->{dump_config},
 
         'help'                  => \$opt->{help},
@@ -314 +318 @@
 &log(1,"alternate titles to $opt->{alt_title_file}") unless $opt->{nolog};
 
-&read_config_file($opt->{config_file},0) if ($opt->{config_file});
-
+# convert from old Data::Dumper to newer Storable config file
+if ((defined $opt->{old_config_file}) && (-r $opt->{old_config_file})) {
+        &read_config_file($opt->{old_config_file},0) if ($opt->{old_config_file});
+        &write_config_file;
+        unlink($opt->{old_config_file});
+}
+
+&read_storable_file($opt->{config_file}) if ($opt->{config_file});
 &show_settings;
 
@@ -360 +370 @@
 
 ######################################################################################################
-# read settings
+# read settings (used for old config file and shepherd .conf files)
 
 sub read_config_file
@@ -373 +383 @@
 }
 
+######################################################################################################
+# used for reconciler new style config file
+
+sub read_storable_file
+{
+        my($file,$die_on_failure) = @_;
+        if (!(-r $file)) {
+                die "file $file could not be read.  aborting.\n" if $die_on_failure;
+                return;
+        }
+
+        my $store = Storable::retrieve($file);
+        $setting_override = $store->{settings_override};
+        $title_xlate_table = $store->{title_xlate_table};
+        $title_history = $store->{title_history};
+
+        if (defined $opt->{dump_config}) {
+                print Dumper($store);
+                exit(0);
+        }
+}
 
 ######################################################################################################
@@ -387 +418 @@
         }
 
-        open(CONF, ">$opt->{config_file}") || die "cannot write to $opt->{config_file}: $!";
-        print CONF Data::Dumper->Dump(
-                [$setting_override,  $title_xlate_table,  $title_history],
-                ["setting_override", "title_xlate_table", "title_history" ]);
-        close CONF;
+        my $store;
+        $store->{settings_override} = $setting_override;
+        $store->{title_xlate_table} = $title_xlate_table;
+        $store->{title_history} = $title_history;
+
+        Storable::store($store, $opt->{config_file});
         &log(1,(sprintf "updated configuration file %s.\n",$opt->{config_file}));
 }

status

@@ -11 +11 @@
 grabber         yahoo7web           0.04
 grabber         ten_website         0.02
-reconciler      reconciler_mk2      0.18
-postprocessor   imdb_augment_data   0.07
+reconciler      reconciler_mk2      0.19
+postprocessor   imdb_augment_data   0.08
 postprocessor   augment_timezone    0.05