diff options
| author | Yen Chi Hsuan <[email protected]> | 2015-12-13 15:33:11 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <[email protected]> | 2015-12-13 15:43:20 +0800 |
| commit | 47c7f3d99504325c43651b781376ea470e7e28bd (patch) | |
| tree | cca9b49ca12386a5ac6a55ff64d2e7648c0e6157 | |
| parent | 0014ffa829ad0d39d7231f664ea4436d2edd5c6a (diff) | |
| download | youtube-dl-47c7f3d99504325c43651b781376ea470e7e28bd.tar.gz youtube-dl-47c7f3d99504325c43651b781376ea470e7e28bd.zip | |
[novamov] Fix filekey extraction (closes #7764)
| -rw-r--r-- | youtube_dl/extractor/novamov.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py index 837c91559..0c4ff90f2 100644 --- a/youtube_dl/extractor/novamov.py +++ b/youtube_dl/extractor/novamov.py @@ -23,9 +23,10 @@ class NovaMovIE(InfoExtractor): _HOST = 'www.novamov.com' _FILE_DELETED_REGEX = r'This file no longer exists on our servers!</h2>' - _FILEKEY_REGEX = r'flashvars\.filekey="(?P<filekey>[^"]+)";' + _FILEKEY_REGEX = r'flashvars\.filekey=(?P<filekey>"?[^"]+"?);' _TITLE_REGEX = r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>([^<]+)</h3>' _DESCRIPTION_REGEX = r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>[^<]+</h3><p>([^<]+)</p>' + _URL_TEMPLATE = 'http://%s/video/%s' _TEST = { 'url': 'http://www.novamov.com/video/4rurhn9x446jj', @@ -42,7 +43,7 @@ class NovaMovIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - url = 'http://%s/video/%s' % (self._HOST, video_id) + url = self._URL_TEMPLATE % (self._HOST, video_id) webpage = self._download_webpage( url, video_id, 'Downloading video page') @@ -51,8 +52,13 @@ class NovaMovIE(InfoExtractor): raise ExtractorError('Video %s does not exist' % video_id, expected=True) def extract_filekey(default=NO_DEFAULT): - return self._search_regex( + filekey = self._search_regex( self._FILEKEY_REGEX, webpage, 'filekey', default=default) + if filekey is not default and (filekey[0] != '"' or filekey[-1] != '"'): + return self._search_regex( + r'var\s*%s\s*=\s*"([^"]+)"', webpage, 'filekey', default=default) + else: + return filekey filekey = extract_filekey(default=None) @@ -127,7 +133,6 @@ class NowVideoIE(NovaMovIE): _HOST = 'www.nowvideo.to' _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<' - _FILEKEY_REGEX = r'var fkzd="([^"]+)";' _TITLE_REGEX = r'<h4>([^<]+)</h4>' _DESCRIPTION_REGEX = r'</h4>\s*<p>([^<]+)</p>' @@ -153,6 +158,7 @@ class VideoWeedIE(NovaMovIE): _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<' _TITLE_REGEX = r'<h1 class="text_shadow">([^<]+)</h1>' + _URL_TEMPLATE = 'http://%s/file/%s' _TEST = { 'url': 'http://www.videoweed.es/file/b42178afbea14', |