diff --git a/HISTORY.rst b/HISTORY.rst index d85017c..97f8bb6 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -110,6 +110,7 @@ History - Added `PCM` as new `audio_codec` possible value. - Added `LPCM` as new `audio_codec` possible value. - Added `Digital Master` as new `source` possible value. +- Added several new values for `streaming_service`. 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index 157623b..6f9a567 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -72,11 +72,22 @@ Main properties Name of the streaming service. - - ``A&E``, ``ABC``, ``AMC``, ``Amazon Prime``, ``Adult Swim``, ``BBC iPlayer``, ``CBS``, ``Comedy Central``, - ``Crunchy Roll``, ``The CW``, ``Discovery``, ``DIY Network``, ``Disney``, ``ePix``, ``HBO Go``, ``History``, - ``Investigation Discovery``, ``IFC``, ``PBS``, ``National Geographic``, ``NBA TV``, ``NBC``, ``NFL``, - ``Nickelodeon``, ``Netflix``, ``iTunes``, ``RTÉ One``, ``SeeSo``, ``Spike TV``, ``Syfy``, ``TFou``, ``TLC``, - ``TV3 Ireland``, ``TV4 Sweeden``, ``TV Land``, ``UFC``, ``USA Network`` + - ``A&E``, ``ABC``, ``ABC Australia``, ``Adult Swim``, ``Al Jazeera English``, ``AMC``, ``America's Test Kitchen``, + ``Amazon Prime``, ``Animal Planet``, ``AnimeLab``, ``AOL``, ``ARD``, ``BBC iPlayer``, ``BravoTV``, ``Canal+``, + ``Cartoon Network``, ``CBC``, ``CBS``, ``Channel 4``, ``CHRGD``, ``Cinemax``, ``CNBC``, ``Comedy Central``, + ``Comedians in Cars Getting Coffee``, ``Country Music Television``, ``Crackle``, ``Crunchy Roll``, ``CSpan``, + ``CTV``, ``CuriosityStream``, ``CWSeed``, ``Daisuki``, ``Deadhouse Films``, ``Digiturk Diledigin Yerde``, + ``Discovery``, ``DIY Network``, ``Disney``, ``Doc Club``, ``DPlay``, ``E!``, ``ePix``, ``El Trece``, ``ESPN``, + ``Esquire``, ``Family``, ``Family Jr``, ``Food Network``, ``Fox``, ``Freeform``, ``FYI Network``, ``Global``, + ``GloboSat Play``, ``Hallmark``, ``HBO Go``, ``HGTV``, ``History``, ``Hulu``, ``Investigation Discovery``, ``IFC``, + ``iTunes``, ``ITV``, ``Knowledge Network``, ``Lifetime``, ``Motor Trend OnDemand``, ``MSNBC``, ``MTV``, + ``National Geographic``, ``NBA TV``, ``NBC``, ``Netflix``, ``NFL``, ``NFL Now``, ``NHL GameCenter``, + ``Nickelodeon``, ``Norsk Rikskringkasting``, ``PBS``, ``PBS Kids``, ``Playstation Network``, ``Pluzz``, ``RTE One``, + ``SBS (AU)``, ``SeeSo``, ``Shomi``, ``Spike``, ``Spike TV``, ``Sportsnet``, ``Sprout``, ``Stan``, ``Starz``, + ``Sveriges Television``, ``SwearNet``, ``Syfy``, ``TBS``, ``TFou``, ``The CW``, ``TLC``, ``TubiTV``, + ``TV3 Ireland``, ``TV4 Sweeden``, ``TV Land``, ``UFC``, ``UKTV``, ``Univision``, ``USA Network``, ``Velocity``, + ``VH1``, ``Viceland``, ``Vimeo``, ``VRV``, ``W Network``, ``WatchMe``, ``WWE Network``, ``Xbox Video``, ``Yahoo``, + ``YouTube Red``, ``ZDF`` Episode properties diff --git a/guessit/rules/properties/streaming_service.py b/guessit/rules/properties/streaming_service.py index 7dc8e32..27e85b4 100644 --- a/guessit/rules/properties/streaming_service.py +++ b/guessit/rules/properties/streaming_service.py @@ -21,104 +21,101 @@ def streaming_service(): # pylint: disable=too-many-statements rebulk = Rebulk().string_defaults(ignore_case=True).regex_defaults(flags=re.IGNORECASE, abbreviations=[dash]) rebulk.defaults(name='streaming_service', tags=['source-prefix']) - rebulk.string('4OD', value='Channel 4') - rebulk.regex('Adult-Swim', value='Adult Swim') rebulk.string('AE', 'A&E', value='A&E') - rebulk.string('AJAZ', value='Al Jazeera English') - rebulk.regex('Amazon-Prime', value='Amazon Prime') rebulk.string('AMBC', value='ABC') + rebulk.string('AUBC', value='ABC Australia') + rebulk.string('AJAZ', value='Al Jazeera English') rebulk.string('AMC', value='AMC') - rebulk.string('AMZN', 'Amazon', 'AmazonPrime', value='Amazon Prime') - rebulk.string('ANLB', value='AnimeLab') + rebulk.string('AMZN', 'Amazon', value='Amazon Prime') + rebulk.regex('Amazon-?Prime', value='Amazon Prime') + rebulk.string('AS', value='Adult Swim') + rebulk.regex('Adult-?Swim', value='Adult Swim') + rebulk.string('ATK', value="America's Test Kitchen") rebulk.string('ANPL', value='Animal Planet') + rebulk.string('ANLB', value='AnimeLab') rebulk.string('AOL', value='AOL') rebulk.string('ARD', value='ARD') - rebulk.string('AS', 'AdultSwim', value='Adult Swim') - rebulk.string('AS', value='Adult Swim') - rebulk.string('ATK', value="America's Test Kitchen") - rebulk.string('AUBC', value='ABC Australia') - rebulk.regex('BBC-iPlayer', value='BBC iPlayer') + rebulk.string('iP', value='BBC iPlayer') + rebulk.regex('BBC-?iPlayer', value='BBC iPlayer') rebulk.string('BRAV', value='BravoTV') + rebulk.string('CNLP', value='Canal+') + rebulk.string('CN', value='Cartoon Network') rebulk.string('CBC', value='CBC') rebulk.string('CBS', value='CBS') - rebulk.string('CC', 'ComedyCentral', value='Comedy Central') - rebulk.regex('Comedy-Central', value='Comedy Central') - rebulk.string('CCGC', value='Comedians in Cars Getting Coffee') + rebulk.string('CNBC', value='CNBC') + rebulk.string('CC', value='Comedy Central') + rebulk.string('4OD', value='Channel 4') rebulk.string('CHGD', value='CHRGD') rebulk.string('CMAX', value='Cinemax') rebulk.string('CMT', value='Country Music Television') - rebulk.string('CN', value='Cartoon Network') - rebulk.string('CNBC', value='CNBC') - rebulk.string('CNLP', value='Canal+') - rebulk.string('CR', 'CrunchyRoll', value='Crunchy Roll') + rebulk.regex('Comedy-?Central', value='Comedy Central') + rebulk.string('CCGC', value='Comedians in Cars Getting Coffee') + rebulk.string('CR', value='Crunchy Roll') rebulk.string('CRKL', value='Crackle') - rebulk.regex('Crunchy-Roll', value='Crunchy Roll') + rebulk.regex('Crunchy-?Roll', value='Crunchy Roll') rebulk.string('CSPN', value='CSpan') rebulk.string('CTV', value='CTV') rebulk.string('CUR', value='CuriosityStream') - rebulk.string('CW', 'TheCW', value='The CW') rebulk.string('CWS', value='CWSeed') - rebulk.string('DDY', value='Digiturk Dilediğin Yerde') + rebulk.string('DSKI', value='Daisuki') rebulk.string('DHF', value='Deadhouse Films') + rebulk.string('DDY', value='Digiturk Diledigin Yerde') rebulk.string('DISC', 'Discovery', value='Discovery') + rebulk.string('DSNY', 'Disney', value='Disney') rebulk.string('DIY', value='DIY Network') rebulk.string('DOCC', value='Doc Club') rebulk.string('DPLY', value='DPlay') - rebulk.string('DSKI', value='Daisuki') - rebulk.string('DSNY', 'Disney', value='Disney') - rebulk.string('DSNY', value='Disney') + rebulk.string('ETV', value='E!') rebulk.string('EPIX', 'ePix', value='ePix') + rebulk.string('ETTV', value='El Trece') rebulk.string('ESPN', value='ESPN') rebulk.string('ESQ', value='Esquire') - rebulk.string('ETTV', value='El Trece') - rebulk.string('ETV', value='E!') rebulk.string('FAM', value='Family') rebulk.string('FJR', value='Family Jr') rebulk.string('FOOD', value='Food Network') rebulk.string('FOX', value='Fox') rebulk.string('FREE', value='Freeform') rebulk.string('FYI', value='FYI Network') - rebulk.string('GC', value='NHL GameCenter') rebulk.string('GLBL', value='Global') rebulk.string('GLOB', value='GloboSat Play') - rebulk.string('HBO', 'HBOGo', value='HBO Go') - rebulk.regex('HBO-Go', value='HBO Go') + rebulk.string('HLMK', value='Hallmark') + rebulk.string('HBO', value='HBO Go') + rebulk.regex('HBO-?Go', value='HBO Go') rebulk.string('HGTV', value='HGTV') rebulk.string('HIST', 'History', value='History') - rebulk.string('HLMK', value='Hallmark') rebulk.string('HULU', value='Hulu') rebulk.string('ID', value='Investigation Discovery') rebulk.string('IFC', 'IFC', value='IFC') - rebulk.string('iP', 'BBCiPlayer', value='BBC iPlayer') rebulk.string('iTunes', 'iT', value='iTunes') rebulk.string('ITV', value='ITV') rebulk.string('KNOW', value='Knowledge Network') rebulk.string('LIFE', value='Lifetime') - rebulk.string('MNBC', value='MSNBC') rebulk.string('MTOD', value='Motor Trend OnDemand') + rebulk.string('MNBC', value='MSNBC') rebulk.string('MTV', value='MTV') - rebulk.string('NATG', 'NationalGeographic', value='National Geographic') - rebulk.regex('National-Geographic', value='National Geographic') + rebulk.string('NATG', value='National Geographic') + rebulk.regex('National-?Geographic', value='National Geographic') rebulk.string('NBA', 'NBATV', value='NBA TV') rebulk.regex('NBA-TV', value='NBA TV') rebulk.string('NBC', value='NBC') rebulk.string('NF', 'Netflix', value='Netflix') rebulk.string('NFL', value='NFL') rebulk.string('NFLN', value='NFL Now') + rebulk.string('GC', value='NHL GameCenter') rebulk.string('NICK', 'Nickelodeon', value='Nickelodeon') rebulk.string('NRK', value='Norsk Rikskringkasting') rebulk.string('PBS', value='PBS') rebulk.string('PBSK', value='PBS Kids') - rebulk.string('PLUZ', value='Pluzz') rebulk.string('PSN', value='Playstation Network') - rebulk.string('RED', value='YouTube Red') - rebulk.string('RTE', value='RTÉ One') + rebulk.string('PLUZ', value='Pluzz') + rebulk.string('RTE', value='RTE One') rebulk.string('SBS', value='SBS (AU)') rebulk.string('SESO', 'SeeSo', value='SeeSo') rebulk.string('SHMI', value='Shomi') - rebulk.string('SNET', value='Sportsnet') rebulk.string('SPIK', value='Spike') - rebulk.string('SPKE', 'SpikeTV', 'Spike TV', value='Spike TV') + rebulk.string('SPKE', value='Spike TV') + rebulk.regex('Spike-?TV', value='Spike TV') + rebulk.string('SNET', value='Sportsnet') rebulk.string('SPRT', value='Sprout') rebulk.string('STAN', value='Stan') rebulk.string('STZ', value='Starz') @@ -127,26 +124,29 @@ def streaming_service(): # pylint: disable=too-many-statements rebulk.string('SYFY', 'Syfy', value='Syfy') rebulk.string('TBS', value='TBS') rebulk.string('TFOU', 'TFou', value='TFou') - rebulk.regex('The-CW', value='The CW') + rebulk.string('CW', value='The CW') + rebulk.regex('The-?CW', value='The CW') rebulk.string('TLC', value='TLC') rebulk.string('TUBI', value='TubiTV') rebulk.string('TV3', value='TV3 Ireland') rebulk.string('TV4', value='TV4 Sweeden') - rebulk.string('TVL', 'TVLand', 'TV Land', value='TV Land') + rebulk.string('TVL', value='TV Land') + rebulk.regex('TV-?Land', value='TV Land') rebulk.string('UFC', value='UFC') rebulk.string('UKTV', value='UKTV') rebulk.string('UNIV', value='Univision') rebulk.string('USAN', value='USA Network') + rebulk.string('VLCT', value='Velocity') rebulk.string('VH1', value='VH1') rebulk.string('VICE', value='Viceland') - rebulk.string('VLCT', value='Velocity') rebulk.string('VMEO', value='Vimeo') rebulk.string('VRV', value='VRV') - rebulk.string('WME', value='WatchMe') rebulk.string('WNET', value='W Network') + rebulk.string('WME', value='WatchMe') rebulk.string('WWEN', value='WWE Network') rebulk.string('XBOX', value='Xbox Video') rebulk.string('YHOO', value='Yahoo') + rebulk.string('RED', value='YouTube Red') rebulk.string('ZDF', value='ZDF') rebulk.rules(ValidateStreamingService)