mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-21 20:46:36 -05:00
[ntv] Simplify
This commit is contained in:
parent
b8b01bb92a
commit
50fc59968e
1 changed files with 19 additions and 27 deletions
|
@ -24,9 +24,9 @@ class NTVIE(InfoExtractor):
|
||||||
'duration': 136,
|
'duration': 136,
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
# rtmp download
|
# rtmp download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.ntv.ru/video/novosti/750370/',
|
'url': 'http://www.ntv.ru/video/novosti/750370/',
|
||||||
|
@ -38,9 +38,9 @@ class NTVIE(InfoExtractor):
|
||||||
'duration': 172,
|
'duration': 172,
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
# rtmp download
|
# rtmp download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.ntv.ru/peredacha/segodnya/m23700/o232416',
|
'url': 'http://www.ntv.ru/peredacha/segodnya/m23700/o232416',
|
||||||
|
@ -52,9 +52,9 @@ class NTVIE(InfoExtractor):
|
||||||
'duration': 1496,
|
'duration': 1496,
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
# rtmp download
|
# rtmp download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.ntv.ru/kino/Koma_film',
|
'url': 'http://www.ntv.ru/kino/Koma_film',
|
||||||
|
@ -66,9 +66,9 @@ class NTVIE(InfoExtractor):
|
||||||
'duration': 5592,
|
'duration': 5592,
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
# rtmp download
|
# rtmp download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.ntv.ru/serial/Delo_vrachey/m31760/o233916/',
|
'url': 'http://www.ntv.ru/serial/Delo_vrachey/m31760/o233916/',
|
||||||
|
@ -80,33 +80,25 @@ class NTVIE(InfoExtractor):
|
||||||
'duration': 2590,
|
'duration': 2590,
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
# rtmp download
|
# rtmp download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
_VIDEO_ID_REGEXES = [
|
_VIDEO_ID_REGEXES = [
|
||||||
r'<meta property="og:url" content="http://www\.ntv\.ru/video/(\d+)',
|
r'<meta property="og:url" content="http://www\.ntv\.ru/video/(\d+)',
|
||||||
r'<video embed=[^>]+><id>(\d+)</id>',
|
r'<video embed=[^>]+><id>(\d+)</id>',
|
||||||
r'<video restriction[^>]+><key>(\d+)</key>'
|
r'<video restriction[^>]+><key>(\d+)</key>',
|
||||||
]
|
]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
|
|
||||||
page = self._download_webpage(url, video_id, 'Downloading page')
|
page = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
for pattern in self._VIDEO_ID_REGEXES:
|
video_id = self._html_search_regex(self._VIDEO_ID_REGEXES, page, 'video id')
|
||||||
mobj = re.search(pattern, page)
|
|
||||||
if mobj:
|
|
||||||
break
|
|
||||||
|
|
||||||
if not mobj:
|
|
||||||
raise ExtractorError('No media links available for %s' % video_id)
|
|
||||||
|
|
||||||
video_id = mobj.group(1)
|
|
||||||
|
|
||||||
player = self._download_xml('http://www.ntv.ru/vi%s/' % video_id, video_id, 'Downloading video XML')
|
player = self._download_xml('http://www.ntv.ru/vi%s/' % video_id, video_id, 'Downloading video XML')
|
||||||
title = unescapeHTML(player.find('./data/title').text)
|
title = unescapeHTML(player.find('./data/title').text)
|
||||||
|
@ -124,7 +116,7 @@ def _real_extract(self, url):
|
||||||
'7': 'video2',
|
'7': 'video2',
|
||||||
}
|
}
|
||||||
|
|
||||||
app = apps[puid22] if puid22 in apps else apps['4']
|
app = apps.get(puid22, apps['4'])
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
for format_id in ['', 'hi', 'webm']:
|
for format_id in ['', 'hi', 'webm']:
|
||||||
|
|
Loading…
Reference in a new issue