Changeset 584 for grabbers/rex

Timestamp:

03/03/07 04:52:30 (6 years ago)

Author:

max

Message:

Rex support for regions 71, 79, and 90

Files:

• grabbers/rex (modified) (5 diffs)

grabbers/rex

@@ -3 +3 @@
 # "Rex"
 
-my $version  = '3.4.4';
+my $version  = '3.5.0';
 
 # An Australian TV Guide Grabber (a.k.a. tv_grab_au)
@@ -76 +76 @@
 # 3.4.3   : Bugfix : don't die on corrupted cache file
 # 3.4.4   : Bugfix : --dump-cache works
+# 3.4.5   : Bugfix : support regions with multiple channels of same name
 
 use strict;
@@ -649 +650 @@
   my $tree = HTML::TreeBuilder->new_from_content($guidedata);
   my $curchan = '';
+  my @channels_seen;
   my ($pid, $block, $line, $link, $title);
   my $c = 0;
@@ -654 +656 @@
   {
     $c++;
-    next if ($curchan eq $tag->as_text()); # Ignore repeated Station name
-    $curchan = $tag->as_text();
-    $curchan =~ s/\(.*\)//;
+    my $channame = $tag->as_text();
+    my $curchan = translate_channel_name($tag->as_text(), grep($_ eq $channame, @channels_seen));
+    push @channels_seen, $channame;
     if (!$channels->{$curchan})
     {
@@ -758 +760 @@
     $lastpids->{$curchan} = $pid;
   }
+}
+
+# The guide pages for some regions don't provide any way to distinguish
+# between (eg) "Prime (Regional)" and "Prime (Albury)" in the same region,
+# other than the order in which they're listed. (They're both called
+# simply "Prime".) This func tracks which is which.
+sub translate_channel_name
+{
+    my ($chan, $seen_before) = @_;
+
+    my $rchans = {
+        71 => { 'TEN' => [ 'TEN (NSW: Southern NSW)', 'TEN (Mildura Digital)' ],
+                'Prime' => [ 'Prime (Canberra/Wollongong/South Coast)', 'Prime (Wagga Wagga/Orange)' ] },
+        79 => { 'WIN' => [ 'WIN (QLD: Regional)', 'WIN (Mackay/Wide Bay)' ],
+                'Seven' => [ 'Seven (Cairns/Townsville/Mackay/Wide Bay/Sunshine Coast)', 'Seven (Rockhampton/Toowoomba)' ] },
+        90 => { 'Prime' => [ 'Prime (Regional)', 'Prime (Albury)' ] }
+        };
+
+    my $region = $opt->{region};
+    return $chan unless ($rchans->{$region} and $rchans->{$region}->{$chan});
+    $seen_before = ($seen_before ? 1 : 0);
+    return $rchans->{$region}->{$chan}->[$seen_before];
 }