dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[podomatic] Extend _VALID_URL (closes #13827)

This commit is contained in:
Sergey M․ 2017-08-05 08:28:12 +07:00
parent c983cc3b71
commit 1d5472290f
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
youtube_dl/extractor/podomatic.py
View File

@ -9,39 +9,46 @@ from ..utils import int_or_none
class PodomaticIE(InfoExtractor): class PodomaticIE(InfoExtractor):
IE_NAME = 'podomatic' IE_NAME = 'podomatic'
_VALID_URL = r'^(?P<proto>https?)://(?P<channel>[^.]+)\.podomatic\.com/entry/(?P<id>[^?]+)' _VALID_URL = r'''(?x)
(?P<proto>https?)://
(?:
(?P<channel>[^.]+)\.podomatic\.com/entry|
(?:www\.)?podomatic\.com/podcasts/(?P<channel_2>[^/]+)/episodes
)/
(?P<id>[^/?#&]+)
'''
_TESTS = [ _TESTS = [{
{ 'url': 'http://scienceteachingtips.podomatic.com/entry/2009-01-02T16_03_35-08_00',
'url': 'http://scienceteachingtips.podomatic.com/entry/2009-01-02T16_03_35-08_00', 'md5': '84bb855fcf3429e6bf72460e1eed782d',
'md5': '84bb855fcf3429e6bf72460e1eed782d', 'info_dict': {
'info_dict': { 'id': '2009-01-02T16_03_35-08_00',
'id': '2009-01-02T16_03_35-08_00', 'ext': 'mp3',
'ext': 'mp3', 'uploader': 'Science Teaching Tips',
'uploader': 'Science Teaching Tips', 'uploader_id': 'scienceteachingtips',
'uploader_id': 'scienceteachingtips', 'title': '64. When the Moon Hits Your Eye',
'title': '64. When the Moon Hits Your Eye', 'duration': 446,
'duration': 446, }
} }, {
}, 'url': 'http://ostbahnhof.podomatic.com/entry/2013-11-15T16_31_21-08_00',
{ 'md5': 'd2cf443931b6148e27638650e2638297',
'url': 'http://ostbahnhof.podomatic.com/entry/2013-11-15T16_31_21-08_00', 'info_dict': {
'md5': 'd2cf443931b6148e27638650e2638297', 'id': '2013-11-15T16_31_21-08_00',
'info_dict': { 'ext': 'mp3',
'id': '2013-11-15T16_31_21-08_00', 'uploader': 'Ostbahnhof / Techno Mix',
'ext': 'mp3', 'uploader_id': 'ostbahnhof',
'uploader': 'Ostbahnhof / Techno Mix', 'title': 'Einunddreizig',
'uploader_id': 'ostbahnhof', 'duration': 3799,
'title': 'Einunddreizig', }
'duration': 3799, }, {
} 'url': 'https://www.podomatic.com/podcasts/scienceteachingtips/episodes/2009-01-02T16_03_35-08_00',
}, 'only_matching': True,
] }]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id') video_id = mobj.group('id')
channel = mobj.group('channel') channel = mobj.group('channel') or mobj.group('channel_2')
json_url = (('%s://%s.podomatic.com/entry/embed_params/%s' + json_url = (('%s://%s.podomatic.com/entry/embed_params/%s' +
'?permalink=true&rtmp=0') % '?permalink=true&rtmp=0') %