Changeset 983

Timestamp:

Dec 15, 2007, 6:44:32 AM (16 years ago)

Author:

paul

Message:

Add "TEN HD", oztivo: "TDT-Tas" is "TDT", flag_aus_hdtv: WIN in WA is like Nine

Location:

trunk

Files:

• applications/shepherd (modified) (2 diffs)
• grabbers/oztivo (modified) (3 diffs)
• postprocessors/flag_aus_hdtv (modified) (3 diffs)
• references/channel_list (modified) (1 diff)
• status (modified) (3 diffs)

trunk/applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '1.2.29';
+my $version = '1.2.30';
 
 # tv_grab_au
@@ -103 +103 @@
         "Prime Canberra/Sth Coast","Prime Wagga Wagga","Prime Wollongong","Prime Orange",
         "Prime (Regional)","Prime (Albury)","Southern Cross","Central GTS/BKN","Golden West");
+@{$hd_to_sds->{"TEN HD"}} = ("TEN","TEN (NSW: Southern NSW)","TEN (Mildura Digital)",
+        "Sthn Cross TEN","WIN TEN","TDT");
 
 

trunk/grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '1.18';
+my $version = '1.19';
 
 # Requires configuration!
@@ -334 +334 @@
         "SevenHD" => "7HD",
         "SevenHD-Mel" => "7HD",
+        "TenHD" => "TEN HD",
+        "TenHD-Vic" => "TEN HD",
         "SBS-NEWS" => "SBS NEWS",
         "31-Syd" => "TVS",
         "BRIZ" => "Briz 31",
+        "TDT-Tas" => "TDT",
         "Seven-Qld" => "Seven Cairns", # no better match
 
@@ -472 +475 @@
     $data =~ s/(?!=")(\d+)(?=".* channel="SevenHD")/$1.add_offset($1,$tz_diff,$sydney_dst)/ge;
     $data =~ s/(?!=")(\d+)(?=".* channel="SevenHD-Mel")/$1.add_offset($1,$tz_diff,$sydney_dst)/ge;
+    $data =~ s/(?!=")(\d+)(?=".* channel="TenHD")/$1.add_offset($1,$tz_diff,$sydney_dst)/ge;
+    $data =~ s/(?!=")(\d+)(?=".* channel="TenHD-Vic")/$1.add_offset($1,$tz_diff,$sydney_dst)/ge;
 }
 

trunk/postprocessors/flag_aus_hdtv

@@ -13 +13 @@
 
 my $progname = "flag_aus_hdtv";
-my $version = "0.27";
+my $version = "0.28";
 
 $| = 1;
@@ -56 +56 @@
                 "Prime Canberra/Sth Coast","Prime Wagga Wagga","Prime Wollongong","Prime Orange",
                 "Prime (Regional)","Prime (Albury)","Southern Cross","Central GTS/BKN","Golden West");
+@{$hd_to_sds->{"TEN HD"}} = ("TEN","TEN (NSW: Southern NSW)","TEN (Mildura Digital)",
+                "Sthn Cross TEN","WIN TEN","TDT");
 
 my $sd_to_hd;
@@ -317 +319 @@
             # Translate station name to program provider
             if ($name eq "WIN") {
-                if ($opt->{locality} eq "W") {
-                    $name = "TEN";
-                } else {
-                    $name = "Nine";
-                }
+                $name = "Nine";
             }
             if ($name eq "WIN TEN") {

trunk/references/channel_list

@@ -1 @@
-63:ABC2,ABC,SBS News,SBS,Sthn Cross TEN,Central GTS/BKN,7HD
-66:ABC2,ABC,SBS News,SBS,NBN,TEN,Sthn Cross TEN,Nine,Prime,Seven,7HD
-67:ABC2,ABC,SBS News,WIN,SBS,TEN,Prime,7HD
-69:ABC2,ABC,SBS News,SBS,NBN,Sthn Cross TEN,Prime Tamworth/Taree/Port,Prime Lismore/Coffs Hbr,7HD
-71:ABC2,ABC,SBS News,WIN,SBS,TEN (NSW: Southern NSW),TEN (Mildura Digital),Prime Canberra/Sth Coast,Prime Wagga Wagga,Prime Wollongong,Prime Orange,7HD
-73:Channel NSW,ABC,TVS,ABC2,SBS News,SBS,Nine,TEN,Seven,7HD
-74:ABC2,ABC,SBS News,Southern Cross,SBS,Nine,7HD
-75:ABC2,ABC,SBS News,SBS,Briz 31,TEN,Nine,Seven,7HD
-78:ABC2,ABC,SBS News,SBS,NBN,Sthn Cross TEN,TEN,Nine,Prime,Seven,7HD
-79:ABC,ABC2,WIN (QLD: Regional),WIN (Mackay/Wide Bay),SBS News,SBS,TEN,Seven Cairns,Seven (Townsville/Mackay/Wide Bay/Sunshine Coast),Seven (Rockhampton/Toowoomba),7HD
-81:ABC2,ABC,SBS News,SBS,TEN,Nine,Seven,C31 Adelaide,7HD
-82:ABC2,ABC,SBS News,WIN,WIN TEN,SBS,7HD
-83:ABC2,ABC,SBS News,WIN,WIN TEN,SBS,7HD
-85:ABC2,ABC,SBS News,WIN,WIN TEN,SBS,7HD
-86:ABC2,ABC,SBS News,SBS,Sthn Cross TEN,Nine,Central GTS/BKN,7HD
-88:ABC2,ABC,SBS News,WIN,Southern Cross,SBS,TDT,7HD
-90:ABC2,ABC,SBS News,WIN,SBS,TEN,Prime (Regional),Prime (Albury),7HD
-93:ABC2,ABC,SBS News,SBS,TEN,Nine,Channel 31,Seven,7HD
-94:ABC2,ABC,SBS News,SBS,TEN,Nine,Channel 31,Seven,7HD
-95:ABC2,ABC,SBS News,WIN,SBS,TEN,Prime,7HD
-98:ABC,Imparja,ABC2,SBS News,WIN,SBS,Prime,TEN,Seven,7HD
-101:ABC2,ABC,SBS News,Access 31,SBS,TEN,Nine,Seven,7HD
-102:ABC,ABC2,Golden West,SBS News,WIN,SBS,Access 31,Nine,TEN,Seven,7HD
-106:ABC2,Imparja,ABC,SBS News,SBS,Prime Wagga Wagga,Seven,7HD
-107:ABC2,Imparja,ABC,SBS News,SBS,Seven,7HD
-108:ABC2,Imparja,ABC,SBS News,SBS,Seven,7HD
-114:ABC2,Imparja,ABC,SBS News,SBS,Seven,7HD
-126:ABC2,ABC,SBS News,WIN,SBS,TEN,Prime Canberra/Sth Coast,7HD
-184:ABC2,ABC,SBS News,SBS,NBN,Sthn Cross TEN,Prime,7HD
+63:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Sthn Cross TEN,Central GTS/BKN
+66:ABC,ABC2,SBS,SBS News,7HD,TEN HD,NBN,TEN,Sthn Cross TEN,Nine,Prime,Seven
+67:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN,TEN,Prime
+69:ABC,ABC2,SBS,SBS News,7HD,TEN HD,NBN,Sthn Cross TEN,Prime Tamworth/Taree/Port,Prime Lismore/Coffs Hbr
+71:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN,TEN (NSW: Southern NSW),TEN (Mildura Digital),Prime Canberra/Sth Coast,Prime Wagga Wagga,Prime Wollongong,Prime Orange
+73:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Channel NSW,TVS,Nine,TEN,Seven
+74:ABC,ABC2,SBS,SBS News,7HD,Southern Cross,Nine
+75:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Briz 31,TEN,Nine,Seven
+78:ABC,ABC2,SBS,SBS News,7HD,TEN HD,NBN,Sthn Cross TEN,TEN,Nine,Prime,Seven
+79:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN (QLD: Regional),WIN (Mackay/Wide Bay),TEN,Seven Cairns,Seven (Townsville/Mackay/Wide Bay/Sunshine Coast),Seven (Rockhampton/Toowoomba)
+81:ABC,ABC2,SBS,SBS News,7HD,TEN HD,TEN,Nine,Seven,C31 Adelaide
+82:ABC,ABC2,SBS,SBS News,TEN HD,WIN,WIN TEN
+83:ABC,ABC2,SBS,SBS News,TEN HD,WIN,WIN TEN
+85:ABC,ABC2,SBS,SBS News,TEN HD,WIN,WIN TEN
+86:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Sthn Cross TEN,Nine,Central GTS/BKN
+88:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN,Southern Cross,TDT
+90:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN,TEN,Prime (Regional),Prime (Albury)
+93:ABC,ABC2,SBS,SBS News,7HD,TEN HD,TEN,Nine,Channel 31,Seven
+94:ABC,ABC2,SBS,SBS News,7HD,TEN HD,TEN,Nine,Channel 31,Seven
+95:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN,TEN,Prime
+98:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Imparja,WIN,Prime,TEN,Seven
+101:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Access 31,TEN,Nine,Seven
+102:ABC,ABC2,SBS,SBS News,7HD,TEN HD,Golden West,WIN,Access 31,Nine,TEN,Seven
+106:ABC,ABC2,SBS,SBS News,7HD,Seven,Imparja,Prime Wagga Wagga
+107:ABC,ABC2,SBS,SBS News,7HD,Seven,Imparja
+108:ABC,ABC2,SBS,SBS News,7HD,Seven,Imparja
+114:ABC,ABC2,SBS,SBS News,7HD,Seven,Imparja
+126:ABC,ABC2,SBS,SBS News,7HD,TEN HD,WIN,TEN,Prime Canberra/Sth Coast
+184:ABC,ABC2,SBS,SBS News,7HD,TEN HD,NBN,Sthn Cross TEN,Prime
 Foxtel:ACC,AdultsOnly960,AIR,AnimalPlanet,AntennaPacific,ARENATV,ARENATV2,Aurora,BBCWorld,Bio,BloombergTelevision,Boomerang,CartoonNetwork,ChannelV,ChannelV2,CNBC,CNN,CountryMusicChannel,CrimeandInvestigation,DiscoveryChannel,DiscoveryHealth,DiscoveryScience,DiscoveryTravel,DisneyChannel,E!Entertainment,ESPN,Eurosportnews,EXPO,FashionTV,FOXClassics,FOXClassics2,FOXNews,FOXSPORTS1,FOXSPORTS2,FOXSPORTS3,FOXSPORTSNews,FOX8,FOX82,FOXTELBoxOffice,FOXTELGamesworld,FUELTV,Hallmark,HOWTOChannel,LifestyleChannel2,LifeStyleFOOD,MainEvent,MAX,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIETWO,MTV,NatGeoAdventure,NationalGeographic,NickJr,Nickelodeon,NITV,Ovation,PlayhouseDisney,RAIInternational,SCIFI,showcase,SHOWTIME,SHOWTIMEGreats,SHOWTIME2,SkyNewsAustralia,SkyRacing,TCM,THECOMEDYCHANNEL,THECOMEDYCHANNEL2,TheHistoryChannel,TheLifeStyleChannel,TheWeatherChannel,TV1,TV12,TVN,TVSN,UKTV,UKTV2,VH1,W,W2,WORLDMOVIES
 SelecTV:AnimalPlanet,AntennaGreek,BBCWorld,CartoonNetwork,CNN,DiscoveryScience,DiscoveryHealth,DiscoveryTravel,DiscoveryRealTime,E!Entertainment,ERTGreek,Eurosportnews,FashionTV,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIETWO,MTV,NatGeoAdventure,NationalGeographic,Ovation,SkyRacing,TCM,TVChileSpanish,TVE,VH1

trunk/status

@@ -1 @@
-application     shepherd            1.2.29
-reference       channel_list        9
+application     shepherd            1.2.30
+reference       channel_list        10
 reference       Shepherd/Common.pm  0.29
 reference       Shepherd/MythTV.pm  0.7
@@ -7 +7 @@
 grabber         abc_website         3.14-r1
 grabber         sbsnews_website     0.19-r1
-grabber         oztivo              1.18
+grabber         oztivo              1.19
 grabber         yahoo7web           0.30
 grabber         foxtel_swf          0.24-r1
@@ -19 +19 @@
 postprocessor   imdb_augment_data   0.35
 postprocessor   tvdb_augment_data   0.11
-postprocessor   flag_aus_hdtv       0.27
+postprocessor   flag_aus_hdtv       0.28
 postprocessor   augment_timezone    0.17