From 7b6d7001d87ba93386c653f6e8c3a08b32f4ba4c Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 30 Sep 2012 15:19:48 +0200 Subject: DailymotionIE: some videos do not use the "hqURL", "sdURL", "ldURL" keywords. In this case, the "video_url" keyword should be looked for. --- youtube_dl/InfoExtractors.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index bdb2ec311..d91221d4d 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -662,10 +662,12 @@ class DailymotionIE(InfoExtractor): elif 'sdURL' in flashvars: max_quality = 'sdURL' 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)) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract media URL') return - video_url = mobj.group(1).replace('\\/', '/') + video_url = urllib.unquote(mobj.group(1)).replace('\\/', '/') # TODO: support choosing qualities -- cgit v1.2.3 From 63ec7b7479fdd3922f777003199c55403381550b Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 30 Sep 2012 15:30:20 +0200 Subject: DailymotionIE: There is not necessarily an underscore in a Dailymotion URL. --- youtube_dl/InfoExtractors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index d91221d4d..dca26a85a 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -616,7 +616,7 @@ class MetacafeIE(InfoExtractor): class DailymotionIE(InfoExtractor): """Information Extractor for Dailymotion""" - _VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/video/([^_/]+)_([^/]+)' + _VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/video/([^/]+)' IE_NAME = u'dailymotion' def __init__(self, downloader=None): -- cgit v1.2.3 From 13e69f546c26bf35688929d36450b26da6b8d9ee Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sun, 30 Sep 2012 21:45:43 +0200 Subject: Merged, modified and compiled Dailymotion pull request #446 by @Steap --- youtube-dl | Bin 42454 -> 42818 bytes youtube-dl.exe | Bin 3992985 -> 3993053 bytes youtube_dl/InfoExtractors.py | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube-dl b/youtube-dl index fd5e09c3b..1055d246d 100755 Binary files a/youtube-dl and b/youtube-dl differ diff --git a/youtube-dl.exe b/youtube-dl.exe index bf7ba04d0..2b82e43f2 100755 Binary files a/youtube-dl.exe and b/youtube-dl.exe 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 -- cgit v1.2.3