Changeset 395

Timestamp:

12/30/06 16:25:19 (6 years ago)

Author:

lincoln

Message:

make the reconciler whinge (and ignore) any new channels it sees that it doesn't know about.\naddresses ticket #22 in a more generic way...

Files:

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

reconcilers/reconciler_mk2

@@ -95 +95 @@
 
 my $progname = "reconciler_mk2";
-my $version = "0.16";
+my $version = "0.17";
 
 use LWP::UserAgent;
 use Time::HiRes qw(gettimeofday tv_interval);
 use XMLTV;
-use XMLTV::ProgressBar;
 use POSIX qw(strftime mktime);
 use Getopt::Long;
-use HTML::TreeBuilder;
 use Data::Dumper;
 use Compress::Zlib;
-use Cwd;
 
 #### reconciler settings ####
@@ -135 +132 @@
 # always rewrite XMLTV 'start' & 'stop', removing timezone
 $reclogic{always_rewrite_start_stop_without_timezone} = 1;
+
+# add channels from data sources that we don't have in our channels.conf
+$reclogic{always_add_new_channels} = 0; # don't
 
 # when we have a title with a ": " in the middle but no subtitle, split
@@ -218 +218 @@
 
 my $opt = { };
-$opt->{output_file} =           cwd()."/output.xmltv";
-$opt->{config_file} =           cwd()."/".$progname.".config";
-$opt->{log_file} =              cwd()."/".$progname.".log";
-$opt->{alt_title_file} =        cwd()."/".$progname.".alt_title.log";
+$opt->{output_file} =           "output.xmltv";
+$opt->{config_file} =           $progname.".config";
+$opt->{log_file} =              $progname.".log";
+$opt->{alt_title_file} =        $progname.".alt_title.log";
 $opt->{lang} =                  "en";
 
@@ -873 +873 @@
         my $chan = $c->{id};
         my %chan_lang;
+
+        # only add this channel if $reclogic{always_add_new_channels} is set
+        if ((!defined $in->{channels}->{$chan}) && (!$reclogic{always_add_new_channels})) {
+                &log($reclogic{warn_on_unknown_channel},(sprintf "WARNING: channel '%s' from file \"%s\" not in channels.conf; ignored.", $chan, $datafile));
+                $stats{ignored_unknown_channel}++;
+                return;
+        }
 
         if (defined $c->{'display-name'} && defined $c->{'display-name'}->[0]) {

status

@@ -10 +10 @@
 grabber         ninemsn             0.03
 grabber         yahoo7web           0.03
-reconciler      reconciler_mk2      0.16
+reconciler      reconciler_mk2      0.17
 postprocessor   imdb_augment_data   0.06
 postprocessor   augment_timezone    0.04