aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/helsinki.py
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl/extractor/helsinki.py')
-rw-r--r--youtube_dl/extractor/helsinki.py55
1 files changed, 33 insertions, 22 deletions
diff --git a/youtube_dl/extractor/helsinki.py b/youtube_dl/extractor/helsinki.py
index 2a54f3cca..5268efa49 100644
--- a/youtube_dl/extractor/helsinki.py
+++ b/youtube_dl/extractor/helsinki.py
@@ -8,44 +8,55 @@ from .common import InfoExtractor
class HelsinkiIE(InfoExtractor):
+ IE_DESC = 'helsinki.fi'
_VALID_URL = r'https?://video\.helsinki\.fi/Arkisto/flash\.php\?id=(?P<id>\d+)'
_TEST = {
'url': 'http://video.helsinki.fi/Arkisto/flash.php?id=20258',
- 'md5': 'cd829201b890905682eb194cbdea55d7',
'info_dict': {
'id': '20258',
'ext': 'mp4',
'title': 'Tietotekniikkafoorumi-iltapäivä',
+ 'description': 'md5:f5c904224d43c133225130fe156a5ee0',
+ },
+ 'params': {
+ 'skip_download': True, # RTMP
}
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- vid = mobj.group('id')
- webpage = self._download_webpage(url, vid)
+ video_id = mobj.group('id')
+ webpage = self._download_webpage(url, video_id)
formats = []
- mobj = re.search('file=((\w+):[^&]+)', webpage)
- if mobj: formats.append({
- 'ext': mobj.group(2),
- 'play_path': mobj.group(1),
- 'url': 'rtmp://flashvideo.it.helsinki.fi/vod/',
- 'player_url': 'http://video.helsinki.fi/player.swf',
- 'format_note': 'sd'
- })
-
- mobj = re.search('hd\.file=((\w+):[^&]+)', webpage)
- if mobj: formats.append({
- 'ext': mobj.group(2),
- 'play_path': mobj.group(1),
- 'url': 'rtmp://flashvideo.it.helsinki.fi/vod/',
- 'player_url': 'http://video.helsinki.fi/player.swf',
- 'format_note': 'hd'
- })
+
+ mobj = re.search(r'file=((\w+):[^&]+)', webpage)
+ if mobj:
+ formats.append({
+ 'ext': mobj.group(2),
+ 'play_path': mobj.group(1),
+ 'url': 'rtmp://flashvideo.it.helsinki.fi/vod/',
+ 'player_url': 'http://video.helsinki.fi/player.swf',
+ 'format_note': 'sd',
+ 'quality': 0,
+ })
+
+ mobj = re.search(r'hd\.file=((\w+):[^&]+)', webpage)
+ if mobj:
+ formats.append({
+ 'ext': mobj.group(2),
+ 'play_path': mobj.group(1),
+ 'url': 'rtmp://flashvideo.it.helsinki.fi/vod/',
+ 'player_url': 'http://video.helsinki.fi/player.swf',
+ 'format_note': 'hd',
+ 'quality': 1,
+ })
+
+ self._sort_formats(formats)
return {
- 'id': vid,
+ 'id': video_id,
'title': self._og_search_title(webpage).replace('Video: ', ''),
'description': self._og_search_description(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
- 'formats': formats
+ 'formats': formats,
}