mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-05 02:32:44 +01:00
[novamov] Simplify
This commit is contained in:
parent
166ff8a3c7
commit
10bff13a66
@ -8,9 +8,8 @@
|
|||||||
compat_urlparse
|
compat_urlparse
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class NovamovIE(InfoExtractor):
|
class NovamovIE(InfoExtractor):
|
||||||
IE_NAME = 'novamov'
|
|
||||||
IE_DESC = 'novamov.com videos'
|
|
||||||
_VALID_URL = r'http://(?:www\.novamov\.com/video/|embed\.novamov\.com/embed\.php\?v=)(?P<videoid>[a-z\d]{13})'
|
_VALID_URL = r'http://(?:www\.novamov\.com/video/|embed\.novamov\.com/embed\.php\?v=)(?P<videoid>[a-z\d]{13})'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
@ -33,11 +32,8 @@ def _real_extract(self, url):
|
|||||||
if re.search(r'This file no longer exists on our servers!</h2>', page) is not None:
|
if re.search(r'This file no longer exists on our servers!</h2>', page) is not None:
|
||||||
raise ExtractorError(u'Video %s does not exist' % video_id, expected=True)
|
raise ExtractorError(u'Video %s does not exist' % video_id, expected=True)
|
||||||
|
|
||||||
mobj= re.search(r'flashvars\.filekey="(?P<filekey>[^"]+)";', page)
|
filekey = self._search_regex(
|
||||||
if mobj is None:
|
r'flashvars\.filekey="(?P<filekey>[^"]+)";', page, 'filekey')
|
||||||
raise ExtractorError('Unable to extract filekey', expected=True)
|
|
||||||
|
|
||||||
filekey = mobj.group('filekey')
|
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>([^<]+)</h3>',
|
r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>([^<]+)</h3>',
|
||||||
@ -47,8 +43,9 @@ def _real_extract(self, url):
|
|||||||
r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>[^<]+</h3><p>([^<]+)</p>',
|
r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>[^<]+</h3><p>([^<]+)</p>',
|
||||||
page, 'description', fatal=False)
|
page, 'description', fatal=False)
|
||||||
|
|
||||||
api_response = self._download_webpage('http://www.novamov.com/api/player.api.php?key=%s&file=%s' % (filekey, video_id),
|
api_response = self._download_webpage(
|
||||||
video_id, 'Downloading video api response')
|
'http://www.novamov.com/api/player.api.php?key=%s&file=%s' % (filekey, video_id),
|
||||||
|
video_id, 'Downloading video api response')
|
||||||
|
|
||||||
response = compat_urlparse.parse_qs(api_response)
|
response = compat_urlparse.parse_qs(api_response)
|
||||||
|
|
||||||
@ -62,4 +59,4 @@ def _real_extract(self, url):
|
|||||||
'url': video_url,
|
'url': video_url,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': description
|
'description': description
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user