dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged, modified and compiled Dailymotion pull request #446 by @Steap

This commit is contained in:
Filippo Valsorda 2012-09-30 21:45:43 +02:00
parent 63ec7b7479
commit 13e69f546c
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
youtube-dl
View File

Binary file not shown.

BIN
youtube-dl.exe
View File

Binary file not shown.

4
youtube_dl/InfoExtractors.py
View File

@ -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