projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[openload] Add support for oladblock domains (#20471)
[youtube-dl]
/
youtube_dl
/
extractor
/
rutv.py
diff --git
a/youtube_dl/extractor/rutv.py
b/youtube_dl/extractor/rutv.py
index d9df0686133a6772deb1e58260069857620afc58..d2713c19a053cba19448ad772525157144b19efa 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
@@
-13,11
+13,15
@@
from ..utils import (
class RUTVIE(InfoExtractor):
IE_DESC = 'RUTV.RU'
_VALID_URL = r'''(?x)
class RUTVIE(InfoExtractor):
IE_DESC = 'RUTV.RU'
_VALID_URL = r'''(?x)
- https?://player\.(?:rutv\.ru|vgtrk\.com)/
- (?P<path>flash2v/container\.swf\?id=
- |iframe/(?P<type>swf|video|live)/id/
- |index/iframe/cast_id/)
- (?P<id>\d+)'''
+ https?://
+ (?:test)?player\.(?:rutv\.ru|vgtrk\.com)/
+ (?P<path>
+ flash\d+v/container\.swf\?id=|
+ iframe/(?P<type>swf|video|live)/id/|
+ index/iframe/cast_id/
+ )
+ (?P<id>\d+)
+ '''
_TESTS = [
{
_TESTS = [
{
@@
-99,17
+103,21
@@
class RUTVIE(InfoExtractor):
'skip_download': True,
},
},
'skip_download': True,
},
},
+ {
+ 'url': 'https://testplayer.vgtrk.com/iframe/live/id/19201/showZoomBtn/false/isPlay/true/',
+ 'only_matching': True,
+ },
]
@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|vgtrk\.com)/(?:iframe/(?:swf|video|live)/id|index/iframe/cast_id)/.+?)\1', webpage)
+ r'<iframe[^>]+?src=(["\'])(?P<url>https?://
(?:test)?
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)/flash2
v/container\.swf\?id=.+?\2)',
+ r'<meta[^>]+?property=(["\'])og:video\1[^>]+?content=(["\'])(?P<url>https?://
(?:test)?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
+127,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')
@@
-131,7
+139,7
@@
class RUTVIE(InfoExtractor):
is_live = video_type == 'live'
json_data = self._download_json(
is_live = video_type == 'live'
json_data = self._download_json(
- 'http://player.rutv.ru/iframe/
%splay/id/%s' % ('live-' if is_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']:
@@
-168,7
+176,7
@@
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),