Changeset 1418

Show
Ignore:
Timestamp:
05/28/12 23:37:22 (13 months ago)
Author:
max
Message:

Various PayTV channel fixes

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/grabbers/yahoo7widget

    r1390 r1418  
    2626 
    2727my $progname = "yahoo7widget"; 
    28 my $version = "2.27"; 
     28my $version = "2.28"; 
    2929 
    3030use XMLTV; 
    … …  
    4747$| = 1; 
    4848 
    49 # map yahoo paytv names to what shepherd knows them as 
    50 my %paytv_fixups = ( qw{ 
    51         111HITS 111Hits 13THSTREET2 13thSTREET2 A-PAC APAC Bio. Bio BloombergTELEVISION BloombergTelevision  
    52         BOOMERANG Boomerang CARTOONNETWORK CartoonNetwork BBCCBeebies Cbeebies CrimeInvestigation Crime DiscoveryHomeHealth DiscoveryHealth  
    53         DiscoveryTurboMAX2 DiscTurboMAX2 EUROSPORTNEWS Eurosportnews fashiontv FashionTV FOXSPORTS1HD FoxSports1HD FOXSPORTS2HD FoxSports2HD  
    54         FOXSPORTS3HD FoxSports3HD HITS2 111HITS2 TheLifeStyleChannel2 LifeStyle2 LifeStyleFOODChannel LifeStyleFOOD  
    55         LifeStyleFOODChannel2 LifestyleFOOD2 LifestyleYOU LifeStyleYOU LifeStyleYOU2 LifStyleYOU2 MTVClassics MTVClassic MTVLive MTVNLive  
    56         MTVLiveHD MTVNLiveHD NATGEOWILD NatGeoWild NATGEOWILDHD NatGeoWildHD NickJr. NickJr showtimepremiereHD ShowPremiereHD  
    57         SKYNEWSBUSINESS SKYNewsBusiness SKYNEWSAUSTRALIA SKYNewsNational SkyRacing SKYRacing SkyRacing2 SKYRacing2 STARPICS STARPICS1  
    58         THECOMEDYCHANNEL ComedyChannel THECOMEDYCHANNEL2 Comedy2 TheWORLDMOVIESChannel WORLDMOVIES UniversalChannel Universal  
    59         } ); 
     49# Map yahoo paytv names to what shepherd knows them as. 
     50# Format: 'yahoo7widget name' => 'official name' 
     51my %paytv_fixups = ( 
     52    '111HITS' => '111Hits', 
     53    '13THSTREET2' => '13thSTREET2', 
     54    'A-PAC' => 'APAC', 
     55    'Bio.' => 'Bio', 
     56    'BloombergTELEVISION' => 'BloombergTelevision', 
     57    'BOOMERANG' => 'Boomerang', 
     58    'CARTOONNETWORK' => 'CartoonNetwork', 
     59    'BBCCBeebies' => 'Cbeebies', 
     60    'CrimeInvestigation' => 'Crime', 
     61    'DiscoveryHomeHealth' => 'DiscoveryHealth', 
     62    'DiscoveryTurboMAX2' => 'DiscTurboMAX2', 
     63    'EUROSPORTNEWS' => 'Eurosportnews', 
     64    'fashiontv' => 'FashionTV', 
     65    'FOXSPORTS1HD' => 'FoxSports1HD', 
     66    'FOXSPORTS2HD' => 'FoxSports2HD', 
     67    'FOXSPORTS3HD' => 'FoxSports3HD', 
     68    'HITS2' => '111HITS2' , 
     69    'TheLifeStyleChannel2' => 'LifeStyle2', 
     70    'LifeStyleFOODChannel' => 'LifeStyleFOOD', 
     71    'LifeStyleFOODChannel2' => 'LifestyleFOOD2', 
     72    'LifestyleYOU' => 'LifeStyleYOU', 
     73    'LifeStyleYOU2' => 'LifStyleYOU2', 
     74    'MTVClassics' => 'MTVClassic', 
     75    'MTVLive' => 'MTVNLive', 
     76    'MTVLiveHD' => 'MTVNLiveHD', 
     77    'NATGEOWILD' => 'NatGeoWild', 
     78    'NATGEOWILDHD' => 'NatGeoWildHD', 
     79    'NickJr.' => 'NickJr', 
     80    'showtimepremiereHD' => 'ShowPremiereHD', 
     81    'SKYNEWSBUSINESS' => 'SKYNewsBusiness', 
     82    'SKYNEWSAUSTRALIA' => 'SKYNewsNational', 
     83    'SkyRacing' => 'SKYRacing', 
     84    'SkyRacing2' => 'SKYRacing2', 
     85    'STARPICS' => 'STARPICS1', 
     86    'THECOMEDYCHANNEL' => 'ComedyChannel', 
     87    'THECOMEDYCHANNEL2' => 'Comedy2', 
     88    'TheWORLDMOVIESChannel' => 'WORLDMOVIES', 
     89    'UniversalChannel' => 'Universal', 
     90    'FOXFOOTY' => 'FOX FOOTY', 
     91    'FOXFOOTYHD' => 'FOX FOOTY HD', 
     92    'ESPN2HD' => 'ESPN2 HD', 
     93); 
    6094 
    6195# 

  • trunk/references/channel_list

    r1412 r1418  
    4242267:ABC1,ABC2 / ABC4,ABC3,SBS ONE,SBS TWO,Prime HD,PRIME7,WIN,SC10,ABC News 24,SBS HD,ONE,GO!,7TWO,WIN HD,GEM,7mate,ELEVEN,Television 4,4ME 
    4343268:ABC1,ABC2 / ABC4,ABC3,SBS ONE,SBS TWO,Prime HD,PRIME7,WIN,SC10,ABC News 24,SBS HD,ONE,GO!,7TWO,WIN HD,GEM,7mate,ELEVEN,Television 4,4ME 
    44 Foxtel:111Hits,111HITS2,13THSTREET,13thSTREET2,3DChannel,ACC,AdultsOnly960,AIR,AlJazeera,AnimalPlanet,AntennaPacific,APAC,Arena,Arena2,Aurora,BBCKnowledge,BBCKnowledgeHD,BBCWorldNews,Bio,BloombergTelevision,Boomerang,CartoonNetwork,Cbeebies,CCTVNews,ChannelV,CMC,CNBC,CNN,Comedy2,ComedyChannel,Crime,Discovery2,DiscoveryChannel,DiscoveryHealth,DiscoveryScience,DiscoveryTurboMAX,DiscoveryWorldHD,DiscTurboMAX2,DisneyChannel,E!Entertainment,ESPN,ESPNHD,Eurosport,Eurosportnews,EXPO,FashionTV,FMC,FOX8,FOX82,FOX8HD,FOXClassics,FOXClassics2,FOXNews,FOXSPORTS1,FoxSports1HD,FOXSPORTS2,FoxSports2HD,FOXSPORTS3,FoxSports3HD,FOXSPORTSNews,FoxtelBoxOffice,FUELTV,LifeStyleHOME,KidsCo,LifeStyle2,LifeStyleFOOD,LifestyleFOOD2,LifeStyleYOU,LifStyleYOU2,MainEvent,MAX,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIEONEHD,MOVIETWO,MTV,MTVClassic,MTVHits,MTVNLive,MTVNLiveHD,NatGeo2,NatGeoAdventure,NatGeoAdventure2,NatGeoHD,NatGeoWild,NatGeoWildHD,NationalGeographic,Nickelodeon,NickJr,NITV,Ovation,PlayhouseDisney,RAIITALIA,SCIFI,SCIFI2,SetantaSports,showcase,showcaseHD,showcasetwo,ShowPremiereHD,showtimeaction,showtimeactionHD,showtimecomedy,showtimedrama,showtimepremiere,showtimetwo,SKYNewsBusiness,SKYNewsNational,SKYRacing,SKYRacing2,SKYRacingWorld,SPEED,SPEEDHD,STARPICS1,STARPICS1HD,STARPICS2,STARPICS2HD,STVDIO,TCM,TheHistoryChannel,TheLifeStyleChannel,Style,TheWeatherChannel,TLC,TLC2,TSN,TV1,TV12,TVN,TVSN,UKTV,UKTV2,UKTVHD,Universal,VHits,W,W2,WHD,WORLDMOVIES,FX,FOX FOOTY,FOX FOOTY HD,ESPN2,ESPN2 HD 
     44Foxtel:111Hits,111HITS2,13THSTREET,13thSTREET2,3DChannel,ACC,AdultsOnly960,AIR,AlJazeera,AnimalPlanet,AntennaPacific,APAC,Arena,Arena2,Aurora,BBCKnowledge,BBCKnowledgeHD,BBCWorldNews,Bio,BloombergTelevision,Boomerang,CartoonNetwork,Cbeebies,CCTVNews,ChannelV,CMC,CNBC,CNN,Comedy2,ComedyChannel,Crime,Discovery2,DiscoveryChannel,DiscoveryHealth,DiscoveryScience,DiscoveryTurboMAX,DiscoveryWorldHD,DiscTurboMAX2,DisneyChannel,E!Entertainment,ESPN,ESPNHD,Eurosport,Eurosportnews,EXPO,FashionTV,FMC,FOX8,FOX82,FOX8HD,FOXClassics,FOXClassics2,FOXNews,FOXSPORTS1,FoxSports1HD,FOXSPORTS2,FoxSports2HD,FOXSPORTS3,FoxSports3HD,FOXSPORTSNews,FoxtelBoxOffice,FUELTV,LifeStyleHOME,KidsCo,LifeStyle2,LifeStyleFOOD,LifestyleFOOD2,LifeStyleYOU,LifStyleYOU2,LifestyleHD,MainEvent,MAX,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIEONEHD,MOVIETWO,MTV,MTVClassic,MTVHits,MTVNLive,MTVNLiveHD,NatGeo2,NatGeoAdventure,NatGeoAdventure2,NatGeoHD,NatGeoWild,NatGeoWildHD,NationalGeographic,Nickelodeon,NickJr,NITV,Ovation,PlayhouseDisney,RAIITALIA,SCIFI,SCIFI2,SetantaSports,showcase,showcaseHD,showcasetwo,ShowPremiereHD,showtimeaction,showtimeactionHD,showtimecomedy,showtimedrama,showtimepremiere,showtimetwo,SKYNewsBusiness,SKYNewsNational,SKYRacing,SKYRacing2,SKYRacingWorld,SPEED,SPEEDHD,STARPICS1,STARPICS1HD,STARPICS2,STARPICS2HD,STVDIO,TCM,TheHistoryChannel,TheLifeStyleChannel,Style,TheWeatherChannel,TLC,TLC2,TSN,TV1,TV12,TVN,TVSN,UKTV,UKTV2,UKTVHD,Universal,VHits,W,W2,WHD,WORLDMOVIES,FX,FXHD,FOX FOOTY,FOX FOOTY HD,ESPN2,ESPN2 HD,AE,AEHD 
    4545SelecTV:AnimalPlanet,AntennaGreek,BBCWorldNews,BloombergTelevision,CartoonNetwork,CNN,DiscoveryScience,DiscoveryHealth,TLC,DiscoveryRealTime,DisneyChannel,E!Entertainment,ERTGreek,Eurosport,FashionTV,FMC,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIETWO,MTV,MTVClassic,NatGeoAdventure,NationalGeographic,Ovation,PlayhouseDisney,SKYRacing,STARPICS1,TCM,TVChileSpanish,TVE 
    4646---migrate--- 

  • trunk/status

    r1417 r1418  
    11application     shepherd            1.7.1 
    2 reference       channel_list        94 
     2reference       channel_list        95 
    33reference       Shepherd/Common.pm  0.39 
    44reference       Shepherd/MythTV.pm  0.10 
    … …  
    77grabber         news                2.0 
    88grabber         oztivo              2.50 
    9 grabber         yahoo7widget        2.27 
     9grabber         yahoo7widget        2.28 
    1010grabber         abc_website         4.11 
    1111grabber         rex                 9.2.0