diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-04-17 19:59:52 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-04-17 19:59:52 +0700 |
| commit | e6c6d10d99ebefcf80ebbb3c5bfef9b675829bee (patch) | |
| tree | e69559857bc431db64624d6aa7dbecc7163f7548 | |
| parent | f270256e06237039779c81e833ccfa098edf6986 (diff) | |
| download | youtube-dl-e6c6d10d99ebefcf80ebbb3c5bfef9b675829bee.tar.xz | |
[podomatic] Improve video URL extraction (Closes #2763)
| -rw-r--r-- | youtube_dl/extractor/podomatic.py | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/youtube_dl/extractor/podomatic.py b/youtube_dl/extractor/podomatic.py index 19ad45c98..ffafd2380 100644 --- a/youtube_dl/extractor/podomatic.py +++ b/youtube_dl/extractor/podomatic.py @@ -6,22 +6,36 @@ import re from .common import InfoExtractor from ..utils import int_or_none - class PodomaticIE(InfoExtractor): IE_NAME = 'podomatic' _VALID_URL = r'^(?P<proto>https?)://(?P<channel>[^.]+)\.podomatic\.com/entry/(?P<id>[^?]+)' - _TEST = { - "url": "http://scienceteachingtips.podomatic.com/entry/2009-01-02T16_03_35-08_00", - "file": "2009-01-02T16_03_35-08_00.mp3", - "md5": "84bb855fcf3429e6bf72460e1eed782d", - "info_dict": { - "uploader": "Science Teaching Tips", - "uploader_id": "scienceteachingtips", - "title": "64. When the Moon Hits Your Eye", - "duration": 446, - } - } + _TESTS = [ + { + 'url': 'http://scienceteachingtips.podomatic.com/entry/2009-01-02T16_03_35-08_00', + 'md5': '84bb855fcf3429e6bf72460e1eed782d', + 'info_dict': { + 'id': '2009-01-02T16_03_35-08_00', + 'ext': 'mp3', + 'uploader': 'Science Teaching Tips', + 'uploader_id': 'scienceteachingtips', + 'title': '64. When the Moon Hits Your Eye', + 'duration': 446, + } + }, + { + 'url': 'http://ostbahnhof.podomatic.com/entry/2013-11-15T16_31_21-08_00', + 'md5': 'd2cf443931b6148e27638650e2638297', + 'info_dict': { + 'id': '2013-11-15T16_31_21-08_00', + 'ext': 'mp3', + 'uploader': 'Ostbahnhof / Techno Mix', + 'uploader_id': 'ostbahnhof', + 'title': 'Einunddreizig', + 'duration': 3799, + } + }, + ] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) @@ -32,10 +46,12 @@ class PodomaticIE(InfoExtractor): '?permalink=true&rtmp=0') % (mobj.group('proto'), channel, video_id)) data_json = self._download_webpage( - json_url, video_id, note=u'Downloading video info') + json_url, video_id, 'Downloading video info') data = json.loads(data_json) video_url = data['downloadLink'] + if not video_url: + video_url = '%s/%s' % (data['streamer'].replace('rtmp', 'http'), data['mediaLocation']) uploader = data['podcast'] title = data['title'] thumbnail = data['imageLocation'] |