X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Frutv.py;h=1ec2c86e5776a88604cb8a294ba67861f61cff82;hb=7212560f4d6b0de5b76eb41090c639855915946e;hp=6c5f5a6804722bc43451f595dcdff56c3a7377b6;hpb=342f630dbf22946aa410e7445dd73256ecdfee43;p=youtube-dl.git
diff --git a/youtube_dl/extractor/rutv.py b/youtube_dl/extractor/rutv.py
index 6c5f5a680..1ec2c86e5 100644
--- a/youtube_dl/extractor/rutv.py
+++ b/youtube_dl/extractor/rutv.py
@@ -84,11 +84,20 @@ class RUTVIE(InfoExtractor):
'title': 'СоÑи-2014. ÐиаÑлон. ÐндивидÑалÑÐ½Ð°Ñ Ð³Ð¾Ð½ÐºÐ°. ÐÑжÑÐ¸Ð½Ñ ',
'description': 'md5:9e0ed5c9d2fa1efbfdfed90c9a6d179c',
},
+ 'skip': 'Translation has finished',
+ },
+ {
+ 'url': 'http://live.russia.tv/index/index/channel_id/3',
+ 'info_dict': {
+ 'id': '21',
+ 'ext': 'mp4',
+ 'title': 're:^РоÑÑÐ¸Ñ 24. ÐÑÑмой ÑÑÐ¸Ñ [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+ 'is_live': True,
+ },
'params': {
- # rtmp download
+ # m3u8 download
'skip_download': True,
},
- 'skip': 'Translation has finished',
},
]
@@ -100,7 +109,7 @@ class RUTVIE(InfoExtractor):
return mobj.group('url')
mobj = re.search(
- r']+?property=(["\'])og:video\1[^>]+?content=(["\'])(?Phttp://player\.(?:rutv\.ru|vgtrk\.com)/flash2v/container\.swf\?id=.+?\2)',
+ r']+?property=(["\'])og:video\1[^>]+?content=(["\'])(?Phttps?://player\.(?:rutv\.ru|vgtrk\.com)/flash2v/container\.swf\?id=.+?\2)',
webpage)
if mobj:
return mobj.group('url')
@@ -162,10 +171,8 @@ class RUTVIE(InfoExtractor):
'vbr': int(quality),
}
elif transport == 'm3u8':
- fmt = {
- 'url': url,
- 'ext': 'mp4',
- }
+ formats.extend(self._extract_m3u8_formats(url, video_id, 'mp4'))
+ continue
else:
fmt = {
'url': url
@@ -183,12 +190,15 @@ class RUTVIE(InfoExtractor):
self._sort_formats(formats)
+ is_live = video_type == 'live'
+
return {
'id': video_id,
- 'title': title,
+ 'title': self._live_title(title) if is_live else title,
'description': description,
'thumbnail': thumbnail,
'view_count': view_count,
'duration': duration,
'formats': formats,
- }
\ No newline at end of file
+ 'is_live': is_live,
+ }