[orf:radio] Cleanup _VALID_URLs (closes #11643)

This commit is contained in:
Sergey M․ 2017-05-14 04:30:29 +07:00
parent efe9316703
commit 1339ecb2f8
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -182,10 +182,9 @@ def extract_entry_dict(info, title, subtitle):
class ORFFM4IE(ORFRadioIE): class ORFFM4IE(ORFRadioIE):
IE_NAME = 'orf:fm4' IE_NAME = 'orf:fm4'
IE_DESC = 'radio FM4' IE_DESC = 'radio FM4'
_VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)' _VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
_TESTS = [ _TEST = {
{
'url': 'http://fm4.orf.at/player/20170107/CC', 'url': 'http://fm4.orf.at/player/20170107/CC',
'md5': '2b0be47375432a7ef104453432a19212', 'md5': '2b0be47375432a7ef104453432a19212',
'info_dict': { 'info_dict': {
@ -199,16 +198,14 @@ class ORFFM4IE(ORFRadioIE):
}, },
'skip': 'Shows from ORF radios are only available for 7 days.' 'skip': 'Shows from ORF radios are only available for 7 days.'
} }
]
class ORFOE1IE(ORFRadioIE): class ORFOE1IE(ORFRadioIE):
IE_NAME = 'orf:oe1' IE_NAME = 'orf:oe1'
IE_DESC = 'Radio Österreich 1' IE_DESC = 'Radio Österreich 1'
_VALID_URL = r'https?://(?P<station>oe1)\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)' _VALID_URL = r'https?://(?P<station>oe1)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
_TESTS = [ _TEST = {
{
'url': 'http://oe1.orf.at/player/20170108/456544', 'url': 'http://oe1.orf.at/player/20170108/456544',
'md5': '34d8a6e67ea888293741c86a099b745b', 'md5': '34d8a6e67ea888293741c86a099b745b',
'info_dict': { 'info_dict': {
@ -221,7 +218,6 @@ class ORFOE1IE(ORFRadioIE):
}, },
'skip': 'Shows from ORF radios are only available for 7 days.' 'skip': 'Shows from ORF radios are only available for 7 days.'
} }
]
class ORFIPTVIE(InfoExtractor): class ORFIPTVIE(InfoExtractor):