Changeset 35

Timestamp:

10/06/06 22:52:08 (7 years ago)

Author:

lincoln

Message:

first pass at title_translation_table where grabbers call things different names - just start storing differences .. for now

Files:

• shepherd (modified) (8 diffs)

shepherd

@@ -123 +123 @@
 # postprocessing
 my $postprocessors = { };
+my $title_translation_table = { };
 my $langs = [ 'en' ];
 my $num_timeslots;
@@ -539 +540 @@
     my @proglist = [ ];
     my @position_pointer = [ ];
+    my @grabber_order = [ ];
     my $num_grabbers = 0;
     my $pref_order;
@@ -545 +547 @@
     foreach my $proggy (sort { $grabbers->{$a}->{order} <=> $grabbers->{$b}->{order} } keys %$grabbers) {
         if ((!$grabbers->{$proggy}->{disabled}) && ($plugin_data->{$proggy}) && ($plugin_data->{$proggy}->{valid})) {
+            $grabber_order[$num_grabbers] = $proggy;
             my $orig_prog = $plugin_data->{$proggy}->{xmltv}->[3];
             my $prognum = 0;
@@ -686 +689 @@
 
                 my $chosen_prog = $proglist[$earliest_programme_slot]->[($position_pointer[$earliest_programme_slot])];
+                my $chosen_prog_name = ${XMLTV::best_name($langs,$chosen_prog->{'title'})}[0];
                 $startpoint = $chosen_prog->{'start_epoch'};
                 $stoppoint = $chosen_prog->{'stop_epoch'};
@@ -691 +695 @@
 
                 printf "REC#4: chosen programme is from grabber %d: start %d, end %d, duration %d: \"%s\"\n",
-                    $earliest_programme_slot,$startpoint,$stoppoint,($stoppoint-$startpoint),
-                    ${XMLTV::best_name($langs,$chosen_prog->{'title'})}[0] if $recdebug;
+                    $earliest_programme_slot,$startpoint,$stoppoint,($stoppoint-$startpoint),$chosen_prog_name if $recdebug;
 
                 #
-                # 5a. see if we have it duplicated from multiple grabbers (with fuzz -/+ 5 mins max), -/+ 2.5mins for programmes <= 15 mins
-                # TODO (FUTURE): should really do an exact start/stop match as a first pass, then do the fuzz afterwards..
-
+                # 5a. see if we have it duplicated from multiple grabbers, first with exact match
+                # 5b. then with fuzz -/+ 5 mins max, -/+ 2.5mins for programmes <= 15 mins
+                
                 my $start1, my $start2, my $stop1, my $stop2;
 
@@ -716 +719 @@
                 }
 
-                printf "REC#5: looking in other grabbers for matching programmes within timeslot start %d-%d (%d) and end %d-%d (%d)\n",
+                printf "REC#5a: looking in other grabbers for matching programmes within timeslot start %d and end %d (%d)\n",$startpoint,$stoppoint,($stoppoint-$startpoint) if $recdebug;
+                for (my $i=0; $i < $num_grabbers; $i++) {
+                    next if ($i == $earliest_programme_slot);
+                    next if ($position_pointer[$i] == -1);
+                    if ((defined $proglist[$i]->[($position_pointer[$i])]) &&
+                        ($proglist[$i]->[($position_pointer[$i])]->{'channel'} eq $channels->{$ch}) &&
+                        ($proglist[$i]->[($position_pointer[$i])]->{'start_epoch'} == $startpoint) &&
+                        ($proglist[$i]->[($position_pointer[$i])]->{'stop_epoch'} == $stoppoint)) {
+                        # winner .. matches our criteria ...
+                        my $match_prog = $proglist[$i]->[($position_pointer[$i])];
+                        my $match_prog_name = ${XMLTV::best_name($langs,$match_prog->{'title'})}[0];
+
+                        printf "REC#5a:   found programme on grabber %d: start %d, end %d: \"%s\"\n", $i,
+                            $match_prog->{'start_epoch'},$match_prog->{'stop_epoch'},$match_prog_name if $recdebug;
+
+                        if ($chosen_prog_name ne $match_prog_name) {
+                            # names differ - save it in our translation table for future reference!
+                            $title_translation_table->{$grabber_order[$i]}->{$match_prog_name} = $chosen_prog_name;
+                            printf "REC#5a: title-translation: higher-preference grabber '%s' called programme \"%s\" compared to '%s' calling it \"%s\"\n",
+                                $grabber_order[$earliest_programme_slot],$chosen_prog_name,$grabber_order[$i],$chosen_prog_name if $recdebug;
+                        }
+
+                        foreach my $field (keys %{$match_prog}) {
+                            next if ($field eq "start_epoch");
+                            next if ($field eq "stop_epoch");
+                            if (!defined $new_prog_entry->{$field}) {
+                                printf "REC#5a:      adding field \"%s\"\n",$field if $recdebug;
+                                $new_prog_entry->{$field} = $match_prog->{$field};
+                                # TODO (FUTURE): should we add to programme description to say where we got what data from?
+                            }
+                        }
+                    }
+                }
+
+                printf "REC#5b: looking in other grabbers for matching programmes within timeslot start %d-%d (%d) and end %d-%d (%d)\n",
                     $start1,$start2,($start2-$start1),$stop1,$stop2,($stop2-$stop1) if $recdebug;
 
@@ -732 +769 @@
                         my $match_prog = $proglist[$i]->[($position_pointer[$i])];
 
-                        printf "REC#5:   found programme on grabber %d: start %d, end %d: \"%s\"\n", $i,
+                        printf "REC#5b:   found programme on grabber %d: start %d, end %d: \"%s\"\n", $i,
                             $match_prog->{'start_epoch'},$match_prog->{'stop_epoch'},
                             ${XMLTV::best_name($langs,$match_prog->{'title'})}[0] if $recdebug;
@@ -1345 +1382 @@
     open(CONF, ">$config_file") or die "cannot write to $config_file: $!";
     print CONF Data::Dumper->Dump(
-        [$region,  $pref_order,  $mirror_site,  $grabbers, $postprocessors  ],
-        ["region", "pref_order", "mirror_site", "grabbers", "postprocessors" ]);
+        [$region,  $pref_order,  $mirror_site,  $grabbers,  $postprocessors,  $title_translation_table  ],
+        ["region", "pref_order", "mirror_site", "grabbers", "postprocessors", "title_translation_table" ]);
     close CONF;
     print "\nUpdated configuration file $config_file.\n" if ($debug);