aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-12-14 02:33:40 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-12-14 02:34:20 +0800
commit6583c741cd31b0ebd605efdbde15a81dd6f81de1 (patch)
treef0b5ada3828fdb4f068086763e4d3e40c1bb8071 /youtube_dl/extractor
parent2d9295643ef2a94880ab96f485f2d7c261856c6e (diff)
[novamov] Fix filekey extraction and reupload test video
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/novamov.py11
1 files changed, 5 insertions, 6 deletions
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'</h4>\s*<p>([^<]+)</p>'
_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',
}