Changeset 501

Timestamp:

02/07/07 13:07:10 (6 years ago)

Author:

max

Message:

per #30

Files:

• grabbers/oztivo (modified) (5 diffs)
• status (modified) (1 diff)

grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '0.13';
+my $version = '0.14';
 
 # Requires configuration!
@@ -27 +27 @@
 # 0.13  : all oztivo programming is in GMT.  add +0000 to its timezone
 #         so the rest of shepherd knows this.
+# 0.14  : patch from Paul to address TEN/10 channels
 
 use strict;
@@ -47 +48 @@
 my $raw_input;
 my $raw_output;
+my $d;
 
 print "$nicename Grabber v$version\n";
@@ -105 +107 @@
 die "\nError in channels file!\nDetails:\n$@" if ($@);
 
+my $shortchannels;
+while (my ($name, $chanid) = each %$channels) {
+  $name =~ s/ *\(.*?\)//g;
+  $shortchannels->{$name} = $chanid;
+  if ($name =~ /TEN/i) {
+    $shortchannels->{10} = $chanid;
+  }
+}
+
 # Create a list of channel names from longest to shortest
-@clist = sort { length $b <=> length $a } keys %$channels;
+@clist = sort { length $b <=> length $a } keys %$shortchannels;
 print "Channels: @clist.\n";
 
@@ -257 +268 @@
     foreach (@clist)
     {
-        return $channels->{$_} if ($station =~ /$_/i);
-    }
-    print "Warning: station \"$station\" unknown.\n";
+        return $shortchannels->{$_} if ($station =~ /$_/i);
+    }
+
+    if (!defined $d->{ignored_channels}->{$station}) {
+        $d->{ignored_channels}->{$station} = 1;
+        print "Warning: station \"$station\" unknown.\n";
+    }
     return $station;
 }

status

@@ -5 +5 @@
 grabber         abc2_website        2.07
 grabber         sbsnews_website     0.04
-grabber         oztivo              0.13-r1
+grabber         oztivo              0.14
 grabber         jrobbo              0.06
 grabber         ninemsn             0.08