projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify coding cookie
[youtube-dl]
/
youtube_dl
/
extractor
/
rutv.py
diff --git
a/youtube_dl/extractor/rutv.py
b/youtube_dl/extractor/rutv.py
index 6b56b1d492226c0c2c06222cce517a8295ed2f01..a5e672c0a674e3461c261e0b6b2ca7ca9435ea30 100644
(file)
--- a/
youtube_dl/extractor/rutv.py
+++ b/
youtube_dl/extractor/rutv.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-14,7
+14,7
@@
class RUTVIE(InfoExtractor):
IE_DESC = 'RUTV.RU'
_VALID_URL = r'''(?x)
https?://player\.(?:rutv\.ru|vgtrk\.com)/
IE_DESC = 'RUTV.RU'
_VALID_URL = r'''(?x)
https?://player\.(?:rutv\.ru|vgtrk\.com)/
- (?P<path>flash
2
v/container\.swf\?id=
+ (?P<path>flash
\d+
v/container\.swf\?id=
|iframe/(?P<type>swf|video|live)/id/
|index/iframe/cast_id/)
(?P<id>\d+)'''
|iframe/(?P<type>swf|video|live)/id/
|index/iframe/cast_id/)
(?P<id>\d+)'''
@@
-104,12
+104,12
@@
class RUTVIE(InfoExtractor):
@classmethod
def _extract_url(cls, webpage):
mobj = re.search(
@classmethod
def _extract_url(cls, webpage):
mobj = re.search(
- r'<iframe[^>]+?src=(["\'])(?P<url>https?://player\.
rutv\.ru
/(?:iframe/(?:swf|video|live)/id|index/iframe/cast_id)/.+?)\1', webpage)
+ r'<iframe[^>]+?src=(["\'])(?P<url>https?://player\.
(?:rutv\.ru|vgtrk\.com)
/(?:iframe/(?:swf|video|live)/id|index/iframe/cast_id)/.+?)\1', webpage)
if mobj:
return mobj.group('url')
mobj = re.search(
if mobj:
return mobj.group('url')
mobj = re.search(
- r'<meta[^>]+?property=(["\'])og:video\1[^>]+?content=(["\'])(?P<url>https?://player\.(?:rutv\.ru|vgtrk\.com)/flash
2
v/container\.swf\?id=.+?\2)',
+ r'<meta[^>]+?property=(["\'])og:video\1[^>]+?content=(["\'])(?P<url>https?://player\.(?:rutv\.ru|vgtrk\.com)/flash
\d+
v/container\.swf\?id=.+?\2)',
webpage)
if mobj:
return mobj.group('url')
webpage)
if mobj:
return mobj.group('url')
@@
-119,7
+119,7
@@
class RUTVIE(InfoExtractor):
video_id = mobj.group('id')
video_path = mobj.group('path')
video_id = mobj.group('id')
video_path = mobj.group('path')
- if
video_path.startswith('flash2v'
):
+ if
re.match(r'flash\d+v', video_path
):
video_type = 'video'
elif video_path.startswith('iframe'):
video_type = mobj.group('type')
video_type = 'video'
elif video_path.startswith('iframe'):
video_type = mobj.group('type')
@@
-128,8
+128,10
@@
class RUTVIE(InfoExtractor):
elif video_path.startswith('index/iframe/cast_id'):
video_type = 'live'
elif video_path.startswith('index/iframe/cast_id'):
video_type = 'live'
+ is_live = video_type == 'live'
+
json_data = self._download_json(
json_data = self._download_json(
- 'http://player.rutv.ru/iframe/
%splay/id/%s' % ('live-' if video_type == 'live' else '
', video_id),
+ 'http://player.rutv.ru/iframe/
data%s/id/%s' % ('live' if is_live else 'video
', video_id),
video_id, 'Downloading JSON')
if json_data['errors']:
video_id, 'Downloading JSON')
if json_data['errors']:
@@
-156,6
+158,7
@@
class RUTVIE(InfoExtractor):
for transport, links in media['sources'].items():
for quality, url in links.items():
for transport, links in media['sources'].items():
for quality, url in links.items():
+ preference = -1 if priority_transport == transport else -2
if transport == 'rtmp':
mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+))/(?P<playpath>.+)$', url)
if not mobj:
if transport == 'rtmp':
mobj = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+))/(?P<playpath>.+)$', url)
if not mobj:
@@
-165,13
+168,15
@@
class RUTVIE(InfoExtractor):
'play_path': mobj.group('playpath'),
'app': mobj.group('app'),
'page_url': 'http://player.rutv.ru',
'play_path': mobj.group('playpath'),
'app': mobj.group('app'),
'page_url': 'http://player.rutv.ru',
- 'player_url': 'http://player.rutv.ru/flash
2
v/osmf.swf?i=22',
+ 'player_url': 'http://player.rutv.ru/flash
3
v/osmf.swf?i=22',
'rtmp_live': True,
'ext': 'flv',
'vbr': int(quality),
'rtmp_live': True,
'ext': 'flv',
'vbr': int(quality),
+ 'preference': preference,
}
elif transport == 'm3u8':
}
elif transport == 'm3u8':
- formats.extend(self._extract_m3u8_formats(url, video_id, 'mp4'))
+ formats.extend(self._extract_m3u8_formats(
+ url, video_id, 'mp4', preference=preference, m3u8_id='hls'))
continue
else:
fmt = {
continue
else:
fmt = {
@@
-181,17
+186,11
@@
class RUTVIE(InfoExtractor):
'width': width,
'height': height,
'format_id': '%s-%s' % (transport, quality),
'width': width,
'height': height,
'format_id': '%s-%s' % (transport, quality),
- 'preference': -1 if priority_transport == transport else -2,
})
formats.append(fmt)
})
formats.append(fmt)
- if not formats:
- raise ExtractorError('No media links available for %s' % video_id)
-
self._sort_formats(formats)
self._sort_formats(formats)
- is_live = video_type == 'live'
-
return {
'id': video_id,
'title': self._live_title(title) if is_live else title,
return {
'id': video_id,
'title': self._live_title(title) if is_live else title,