Changeset 819

Timestamp:

06/29/07 04:56:01 (6 years ago)

Author:

paul

Message:

reconcilor_mk2: remove ': ' spliting, allow 'SkyRacing?' to have programmes upto 12 hours long, redo remove duplicate categories

Files:

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

reconcilers/reconciler_mk2

@@ -40 +40 @@
 #
 # other features:
-#  - will automatically split titles with "title: subtitle" into "title" and
-#    "subtitle" (controlled via $reclogic{min_title_for_colon_title_split})
 #  - will try to match "same titles" (including fuzzy title matching) for
 #    duplicate programmes within 10 minutes (or whatever
@@ -95 +93 @@
 
 my $progname = "reconciler_mk2";
-my $version = "0.28";
+my $version = "0.29";
 
 use LWP::UserAgent;
@@ -136 +134 @@
 $reclogic{always_add_new_channels} = 0; # don't
 
-# when we have a title with a ": " in the middle but no subtitle, split
-# the title into "title: subtitle" provided title & subtitle are each at least
-# 5 characters long
-$reclogic{min_title_for_colon_title_split} = 5;
-
 # don't accept programmes that last for longer than 8 hours.
 $reclogic{max_programme_length} = (8 * 60 * 60); # 8 hours
+$reclogic{max_programme_length_sky_racing} = (12 * 60 * 60); # 12 hours
 
 # store a preferred title only if we have at least 1 alternative
@@ -1043 +1037 @@
           (strftime "%a%e%b%H%M", localtime($t2)), ($t2 - $t1), $source)) if ($t1 && $t2);
 
-        if ((($t2 - $t1) > $reclogic{max_programme_length}) && ($prog_title !~ /close/i)) {
+        # limit programme length for any not called 'close' but a longer length of 'SkyRacing'
+        if ((($t2 - $t1) > $reclogic{max_programme_length}) && ($prog_title !~ /\bclose\b/i) &&
+            (($in->{channels}->{$prog_chan}->{pref_desc} ne 'SkyRacing') ||
+             (($t2 - $t1) > $reclogic{max_programme_length_sky_racing}))) {
                 &log($reclogic{warn_on_invalid_time_in_prog},
                   (sprintf "WARNING: programme '%s' on channel '%s' from %s had a programme duration (%d) that exceeded max_programme_length (%d): start '%s' stop '%s'; ignored.",
@@ -1057 +1054 @@
         $prog->{grabber_num} = ($in->{num_datafiles}-1);
         my $prog_key = sprintf "%d:%d",$t1,$t2;
-
-        # if there is a ": " in title and no subtitle, split title into "title: subtitle"
-        # provided each of title/subtitle will be at least $reclogic{min_title_for_colon_title_split}
-        # characters
-        if (!defined $prog_subtitle) {
-                my ($title1,$title2) = split(/: /,$prog_title,2);
-
-                if (($title1) && ($title2) &&
-                    (length($title1) >= $reclogic{min_title_for_colon_title_split}) &&
-                    (length($title2) >= $reclogic{min_title_for_colon_title_split})) {
-                        &log($reclogic{debug_subtitle_derived_from_title},
-                          (sprintf "split title \"%s\" into title \"%s\" subtitle \"%s\" since over min_title_for_colon_title_split (%d)",
-                          $prog_title, $title1, $title2, $reclogic{min_title_for_colon_title_split}));
-                        $stats{derived_subtitle_from_title}++;
-
-                        $prog_title = $title1;
-                        $prog->{title}->[0]->[0] = $title1;
-
-                        $prog_subtitle = $title2;
-                        $prog->{'sub-title'}->[0]->[0] = $title2;
-                        $prog->{'sub-title'}->[0]->[1] = $prog->{'title'}->[0]->[1];
-                }
-
-        }       
 
         # check to see if this grabber has supplied a programme with this start/stop on this
@@ -1520 +1493 @@
                                         my $lang = $entry->[1];
                                         $lang = "BLANK" if (!$lang);
-                                        $lang_added{$lang} = $val;
+                                        push(@{$lang_added{$lang}}, $val);
                                         $num_added++;
                                 }
@@ -1543 +1516 @@
                                         #   'premiere' - don't pass it on but instead set premiere field.
                                         #   'en'       - (as in language: en) - just strip
+                                        #   duplicate  - just strip
                                         if ($field eq 'category') {
                                                 if ($val eq "premiere") {
@@ -1551 +1525 @@
                                                         &log($reclogic{debug_add_logic}," - stripped 'en' category");
                                                         next;
+                                                } elsif (defined $lang_added{$lang} && grep($_ eq $val, @{$lang_added{$lang}})) {
+                                                        &log($reclogic{debug_add_logic}," - stripped duplicate category");
+                                                        next;
                                                 }
                                         }
 
-                                        if (($field eq 'category') || ($field eq 'country')) {
-                                                # don't add duplicates
-                                                my $found;
-                                                foreach my $num (0 .. ($num_added-1)) {
-                                                        if (($newprog->{$field}->[$num]->[0] eq $val) and
-                                                                        ((not $newprog->{$field}->[$num]->[1] and ($lang eq "BLANK")) or
-                                                                         ($newprog->{$field}->[$num]->[1] eq $lang))) {
-                                                                $found = 1;
-                                                                last;
-                                                        }
-                                                }
-                                                next if ($found);
-                                        }
-
                                         if ((!defined $lang_added{$lang}) || ($field eq 'category') || ($field eq 'country')) {
-                                                $lang_added{$lang} = $val;
+                                                push(@{$lang_added{$lang}}, $val);
 
                                                 $newprog->{$field}->[$num_added]->[0] = $val;

status

@@ -14 +14 @@
 grabber         southerncross_website   0.12
 grabber         ten_website         1.01
-reconciler      reconciler_mk2      0.28
+reconciler      reconciler_mk2      0.29
 postprocessor   imdb_augment_data   0.21
 postprocessor   tvdb_augment_data   0.04