[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
1 changed files with 29 additions and 33 deletions

View File

@ -182,46 +182,42 @@ class ORFRadioIE(InfoExtractor):
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': { 'id': '2017-01-07_2100_tl_54_7DaysSat18_31295',
'id': '2017-01-07_2100_tl_54_7DaysSat18_31295', 'ext': 'mp3',
'ext': 'mp3', 'title': 'Solid Steel Radioshow',
'title': 'Solid Steel Radioshow', 'description': 'Die Mixshow von Coldcut und Ninja Tune.',
'description': 'Die Mixshow von Coldcut und Ninja Tune.', 'duration': 3599,
'duration': 3599, 'timestamp': 1483819257,
'timestamp': 1483819257, 'upload_date': '20170107',
'upload_date': '20170107', },
}, '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': { 'id': '2017-01-08_0759_tl_51_7DaysSun6_256141',
'id': '2017-01-08_0759_tl_51_7DaysSun6_256141', 'ext': 'mp3',
'ext': 'mp3', 'title': 'Morgenjournal',
'title': 'Morgenjournal', 'duration': 609,
'duration': 609, 'timestamp': 1483858796,
'timestamp': 1483858796, 'upload_date': '20170108',
'upload_date': '20170108', },
}, '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):