projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d92956
)
[novamov] Fix filekey extraction and reupload test video
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sun, 13 Dec 2015 18:33:40 +0000
(
02:33
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sun, 13 Dec 2015 18:34:20 +0000
(
02:34
+0800)
youtube_dl/extractor/novamov.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/novamov.py
b/youtube_dl/extractor/novamov.py
index 97f0549d390e6969520d38535167f5ecbb8f1d70..bbb5be492caf1c03f3731502b52b88d1eea3735c 100644
(file)
--- 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(
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
else:
return filekey
@@
-141,15
+141,14
@@
class NowVideoIE(NovaMovIE):
_DESCRIPTION_REGEX = r'</h4>\s*<p>([^<]+)</p>'
_TEST = {
_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': {
'info_dict': {
- 'id': '
0mw0yow7b6dxa
',
+ 'id': '
f1d6fce9a968b
',
'ext': 'flv',
'ext': 'flv',
- 'title': 'youtubedl test video
_BaW_jenozKc.mp4
',
+ 'title': 'youtubedl test video
BaWjenozKc
',
'description': 'Description',
},
'description': 'Description',
},
- 'skip': 'Video 0mw0yow7b6dxa does not exist',
}
}