Merged, modified and compiled Dailymotion pull request #446 by @Steap
This commit is contained in:
parent
63ec7b7479
commit
13e69f546c
3 changed files with 2 additions and 2 deletions
BIN
youtube-dl
BIN
youtube-dl
Binary file not shown.
BIN
youtube-dl.exe
BIN
youtube-dl.exe
Binary file not shown.
|
@ -637,7 +637,7 @@ class DailymotionIE(InfoExtractor):
|
||||||
self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
|
self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
|
||||||
return
|
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'
|
else: max_quality = 'ldURL'
|
||||||
mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
|
mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
|
||||||
if mobj is None:
|
if mobj is None:
|
||||||
mobj = re.search(r'"video_url":"(.*?)",', urllib.unquote(webpage))
|
mobj = re.search(r'"video_url":"(.*?)",', flashvars)
|
||||||
if mobj is None:
|
if mobj is None:
|
||||||
self._downloader.trouble(u'ERROR: unable to extract media URL')
|
self._downloader.trouble(u'ERROR: unable to extract media URL')
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in a new issue