diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-06-11 21:36:19 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-06-11 21:36:19 +0700 |
| commit | 624bd0104c3c0f367ecb129c438da57398668801 (patch) | |
| tree | 59a6c7b0b39d29324aeb08fa8a1a8c2857c8a4a4 | |
| parent | 28a4d6cce89d159f9fe701e6cf716c7e3ffa4415 (diff) | |
| download | youtube-dl-624bd0104c3c0f367ecb129c438da57398668801.tar.gz youtube-dl-624bd0104c3c0f367ecb129c438da57398668801.tar.xz youtube-dl-624bd0104c3c0f367ecb129c438da57398668801.zip | |
[rutv] Add support for testplayer.vgtrk.com (closes #13347)
| -rw-r--r-- | youtube_dl/extractor/rutv.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/youtube_dl/extractor/rutv.py b/youtube_dl/extractor/rutv.py index a5e672c0a..d2713c19a 100644 --- a/youtube_dl/extractor/rutv.py +++ b/youtube_dl/extractor/rutv.py @@ -13,11 +13,15 @@ from ..utils import ( class RUTVIE(InfoExtractor): IE_DESC = 'RUTV.RU' _VALID_URL = r'''(?x) - https?://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+)''' + 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 = [ { @@ -99,17 +103,21 @@ class RUTVIE(InfoExtractor): '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( - 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( - r'<meta[^>]+?property=(["\'])og:video\1[^>]+?content=(["\'])(?P<url>https?://player\.(?:rutv\.ru|vgtrk\.com)/flash\d+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') |