projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7045 from remitamine/ign
[youtube-dl]
/
youtube_dl
/
extractor
/
rutv.py
diff --git
a/youtube_dl/extractor/rutv.py
b/youtube_dl/extractor/rutv.py
index a5e98415f340dedb7c1e7bc621c7a455bbdefb53..f7fe1feceeccbb3c7dc6860f0ee5d6a9c10a57df 100644
(file)
--- a/
youtube_dl/extractor/rutv.py
+++ b/
youtube_dl/extractor/rutv.py
@@
-104,7
+104,7
@@
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')
if mobj:
return mobj.group('url')
@@
-131,7
+131,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']:
@@
-189,9
+189,6
@@
class RUTVIE(InfoExtractor):
})
formats.append(fmt)
})
formats.append(fmt)
- if not formats:
- raise ExtractorError('No media links available for %s' % video_id)
-
self._sort_formats(formats)
return {
self._sort_formats(formats)
return {