From: Filippo Valsorda Date: Sat, 29 Sep 2012 14:53:06 +0000 (+0200) Subject: Not all Dailymotion videos have an hqURL, now downloads highest quality available X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=3c4d6c9ebae975bafcf3ae1b8d419cb734b50581;p=youtube-dl Not all Dailymotion videos have an hqURL, now downloads highest quality available --- diff --git a/youtube-dl b/youtube-dl index 3a9fb1d4a..fd5e09c3b 100755 Binary files a/youtube-dl and b/youtube-dl differ diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 2a86c505b..4fcff77ff 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -636,13 +636,16 @@ class DailymotionIE(InfoExtractor): self._downloader.trouble(u'ERROR: unable to extract media URL') return flashvars = urllib.unquote(mobj.group(1)) - mobj = re.search(r'"hqURL":"(.+?)"', flashvars) + if 'hqURL' in flashvars: max_quality = 'hqURL' + elif 'sdURL' in flashvars: max_quality = 'sdURL' + else: max_quality = 'ldURL' + mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract media URL') return - hqURL = mobj.group(1).replace('\\/', '/') + video_url = mobj.group(1).replace('\\/', '/') - # TODO: support ldurl and sdurl qualities + # TODO: support choosing qualities mobj = re.search(r'', webpage) if mobj is None: @@ -658,7 +661,7 @@ class DailymotionIE(InfoExtractor): return [{ 'id': video_id.decode('utf-8'), - 'url': hqURL.decode('utf-8'), + 'url': video_url.decode('utf-8'), 'uploader': video_uploader.decode('utf-8'), 'upload_date': u'NA', 'title': video_title,