X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdailymotion.py;h=f7dffd4cce3a1fc2d04bd016111aa354717072a6;hb=cf1dd0c59e8ff4c66130bc47954c415be5db8cc3;hp=f54ecc569cbe02714df09cdaf55c72ffd7129895;hpb=bd2dee6c67b837bdebdd28d10d9586129021330e;p=youtube-dl

diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py
index f54ecc569..f7dffd4cc 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dl/extractor/dailymotion.py
@@ -1,5 +1,6 @@
 import re
 import json
+import itertools
 import socket
 
 from .common import InfoExtractor
@@ -33,17 +34,17 @@ class DailyMotionSubtitlesIE(NoAutoSubtitlesIE):
         self._downloader.report_warning(u'video doesn\'t have subtitles')
         return {}
 
-class DailymotionIE(DailyMotionSubtitlesIE):
+class DailymotionIE(DailyMotionSubtitlesIE, 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}/(?:embed/)?video/([^/]+)'
     IE_NAME = u'dailymotion'
     _TEST = {
         u'url': u'http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech',
         u'file': u'x33vw9.mp4',
         u'md5': u'392c4b85a60a90dc4792da41ce3144eb',
         u'info_dict': {
-            u"uploader": u"Alex and Van .",
+            u"uploader": u"Amphora Alex and Van .", 
             u"title": u"Tutoriel de Youtubeur\"DL DES VIDEO DE YOUTUBE\""
         }
     }
@@ -55,6 +56,7 @@ class DailymotionIE(DailyMotionSubtitlesIE):
         video_id = mobj.group(1).split('_')[0].split('?')[0]
 
         video_extension = 'mp4'
+        url = 'http://www.dailymotion.com/video/%s' % video_id
 
         # Retrieve video webpage to extract further information
         request = compat_urllib_request.Request(url)
@@ -77,7 +79,8 @@ class DailymotionIE(DailyMotionSubtitlesIE):
         embed_url = 'http://www.dailymotion.com/embed/video/%s' % video_id
         embed_page = self._download_webpage(embed_url, video_id,
                                             u'Downloading embed page')
-        info = self._search_regex(r'var info = ({.*?}),', embed_page, 'video info')
+        info = self._search_regex(r'var info = ({.*?}),$', embed_page,
+            'video info', flags=re.MULTILINE)
         info = json.loads(info)
 
         # TODO: support choosing qualities
@@ -85,9 +88,9 @@ class DailymotionIE(DailyMotionSubtitlesIE):
         for key in ['stream_h264_hd1080_url','stream_h264_hd_url',
                     'stream_h264_hq_url','stream_h264_url',
                     'stream_h264_ld_url']:
-            if info.get(key):  # key in info and info[key]:
+            if info.get(key):#key in info and info[key]:
                 max_quality = key
-                self.to_screen(u'%s: Using %s' % (video_id, key))
+                self.to_screen(u'Using %s' % key)
                 break
         else:
             raise ExtractorError(u'Unable to extract video URL')