projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:rg3/youtube-dl
[youtube-dl]
/
youtube_dl
/
InfoExtractors.py
diff --git
a/youtube_dl/InfoExtractors.py
b/youtube_dl/InfoExtractors.py
index dca26a85aaf5a9a375325057570a22009753fb07..8d428b25dcd1ff828044881b1ff7dd89705fd12d 100644
(file)
--- a/
youtube_dl/InfoExtractors.py
+++ b/
youtube_dl/InfoExtractors.py
@@
-637,7
+637,7
@@
class DailymotionIE(InfoExtractor):
self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
return
self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
return
- video_id = mobj.group(1)
+ video_id = mobj.group(1)
.split('_')[0].split('?')[0]
video_extension = 'mp4'
video_extension = 'mp4'
@@
-663,7
+663,7
@@
class DailymotionIE(InfoExtractor):
else: max_quality = 'ldURL'
mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
if mobj is None:
else: max_quality = 'ldURL'
mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
if mobj is None:
- mobj = re.search(r'"video_url":"(.*?)",',
urllib.unquote(webpage)
)
+ mobj = re.search(r'"video_url":"(.*?)",',
flashvars
)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract media URL')
return
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract media URL')
return