projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[camdemy] Fix _VALID_URL
[youtube-dl]
/
youtube_dl
/
extractor
/
rutv.py
diff --git
a/youtube_dl/extractor/rutv.py
b/youtube_dl/extractor/rutv.py
index 5c38cbc02b7748b49daf3654291dfe5fe2b49a50..ef766237bf318d40da067a6a820a725fbe0da286 100644
(file)
--- a/
youtube_dl/extractor/rutv.py
+++ b/
youtube_dl/extractor/rutv.py
@@
-12,7
+12,12
@@
from ..utils import (
class RUTVIE(InfoExtractor):
IE_DESC = 'RUTV.RU'
class RUTVIE(InfoExtractor):
IE_DESC = 'RUTV.RU'
- _VALID_URL = r'https?://player\.(?:rutv\.ru|vgtrk\.com)/(?:flash2v/container\.swf\?id=|iframe/(?P<type>swf|video|live)/id/)(?P<id>\d+)'
+ _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+)'''
_TESTS = [
{
_TESTS = [
{
@@
-90,12
+95,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
/.+?)\1', webpage)
+ r'<iframe[^>]+?src=(["\'])(?P<url>https?://player\.rutv\.ru/
(?: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>http://player\.(?:rutv\.ru|vgtrk\.com)/flash2v/container\.swf\?id=.+?\2)',
+ r'<meta[^>]+?property=(["\'])og:video\1[^>]+?content=(["\'])(?P<url>http
s?
://player\.(?:rutv\.ru|vgtrk\.com)/flash2v/container\.swf\?id=.+?\2)',
webpage)
if mobj:
return mobj.group('url')
webpage)
if mobj:
return mobj.group('url')
@@
-103,10
+108,16
@@
class RUTVIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- video_
type = mobj.group('type
')
+ video_
path = mobj.group('path
')
- if
not video_type or video_type == 'swf'
:
+ if
video_path.startswith('flash2v')
:
video_type = 'video'
video_type = 'video'
+ elif video_path.startswith('iframe'):
+ video_type = mobj.group('type')
+ if video_type == 'swf':
+ video_type = 'video'
+ elif video_path.startswith('index/iframe/cast_id'):
+ video_type = 'live'
json_data = self._download_json(
'http://player.rutv.ru/iframe/%splay/id/%s' % ('live-' if video_type == 'live' else '', video_id),
json_data = self._download_json(
'http://player.rutv.ru/iframe/%splay/id/%s' % ('live-' if video_type == 'live' else '', video_id),
@@
-151,10
+162,8
@@
class RUTVIE(InfoExtractor):
'vbr': int(quality),
}
elif transport == 'm3u8':
'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
else:
fmt = {
'url': url
@@
-180,4
+189,4
@@
class RUTVIE(InfoExtractor):
'view_count': view_count,
'duration': duration,
'formats': formats,
'view_count': view_count,
'duration': duration,
'formats': formats,
- }
\ No newline at end of file
+ }