From: Yen Chi Hsuan Date: Sun, 13 Dec 2015 18:33:40 +0000 (+0800) Subject: [novamov] Fix filekey extraction and reupload test video X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=6583c741cd31b0ebd605efdbde15a81dd6f81de1;p=youtube-dl [novamov] Fix filekey extraction and reupload test video --- diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py index 97f0549d3..bbb5be492 100644 --- a/youtube_dl/extractor/novamov.py +++ b/youtube_dl/extractor/novamov.py @@ -59,7 +59,7 @@ class NovaMovIE(InfoExtractor): 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) + r'var\s*%s\s*=\s*"([^"]+)"' % re.escape(filekey), webpage, 'filekey', default=default) else: return filekey @@ -141,15 +141,14 @@ class NowVideoIE(NovaMovIE): _DESCRIPTION_REGEX = r'\s*

([^<]+)

' _TEST = { - 'url': 'http://www.nowvideo.to/video/0mw0yow7b6dxa', - 'md5': 'f8fbbc8add72bd95b7850c6a02fc8817', + 'url': 'http://www.nowvideo.sx/video/f1d6fce9a968b', + 'md5': '12c82cad4f2084881d8bc60ee29df092', 'info_dict': { - 'id': '0mw0yow7b6dxa', + 'id': 'f1d6fce9a968b', 'ext': 'flv', - 'title': 'youtubedl test video _BaW_jenozKc.mp4', + 'title': 'youtubedl test video BaWjenozKc', 'description': 'Description', }, - 'skip': 'Video 0mw0yow7b6dxa does not exist', }