aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-09-30 21:45:43 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-09-30 21:45:43 +0200
commit13e69f546c26bf35688929d36450b26da6b8d9ee (patch)
treebb4fd26a4e83c9fb4022a69d5c0ac2bf32ed93f5
parent63ec7b7479fdd3922f777003199c55403381550b (diff)
Merged, modified and compiled Dailymotion pull request #446 by @Steap
-rwxr-xr-xyoutube-dlbin42454 -> 42818 bytes
-rwxr-xr-xyoutube-dl.exebin3992985 -> 3993053 bytes
-rw-r--r--youtube_dl/InfoExtractors.py4
3 files changed, 2 insertions, 2 deletions
diff --git a/youtube-dl b/youtube-dl
index fd5e09c3b..1055d246d 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index bf7ba04d0..2b82e43f2 100755
--- a/youtube-dl.exe
+++ b/youtube-dl.exe
Binary files differ
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index dca26a85a..8d428b25d 100644
--- 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
- video_id = mobj.group(1)
+ video_id = mobj.group(1).split('_')[0].split('?')[0]
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:
- 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