Initiate new release.

[youtubedl] / youtube_dl / extractor / francetv.py

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index bbc760a4990cac1b6cdb731c161d61c853a72729..170d6807529ac9b121187786cf9329b3b3525dc3 100644 (file)
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -230,12 +230,13 @@ class FranceTVIE(FranceTVBaseInfoExtractor):
 
 class GenerationQuoiIE(InfoExtractor):
     IE_NAME = 'france2.fr:generation-quoi'
 
 class GenerationQuoiIE(InfoExtractor):
     IE_NAME = 'france2.fr:generation-quoi'

-    _VALID_URL = r'https?://generation-quoi\.france2\.fr/portrait/(?P<name>.*)(\?|$)'
+    _VALID_URL = r'https?://generation-quoi\.france2\.fr/portrait/(?P<id>[^/?#]+)'

 
     _TEST = {
         'url': 'http://generation-quoi.france2.fr/portrait/garde-a-vous',
 
     _TEST = {
         'url': 'http://generation-quoi.france2.fr/portrait/garde-a-vous',

-        'file': 'k7FJX8VBcvvLmX4wA5Q.mp4',

         'info_dict': {
         'info_dict': {

+            'id': 'k7FJX8VBcvvLmX4wA5Q',
+            'ext': 'mp4',

             'title': 'Génération Quoi - Garde à Vous',
             'uploader': 'Génération Quoi',
         },
             'title': 'Génération Quoi - Garde à Vous',
             'uploader': 'Génération Quoi',
         },


@@ -243,14 +244,12 @@ class GenerationQuoiIE(InfoExtractor):
             # It uses Dailymotion
             'skip_download': True,
         },
             # It uses Dailymotion
             'skip_download': True,
         },

-        'skip': 'Only available from France',

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        name = mobj.group('name')
-        info_url = compat_urlparse.urljoin(url, '/medias/video/%s.json' % name)
-        info_json = self._download_webpage(info_url, name)
+        display_id = self._match_id(url)
+        info_url = compat_urlparse.urljoin(url, '/medias/video/%s.json' % display_id)
+        info_json = self._download_webpage(info_url, display_id)

         info = json.loads(info_json)
         return self.url_result('http://www.dailymotion.com/video/%s' % info['id'],
                                ie='Dailymotion')
         info = json.loads(info_json)
         return self.url_result('http://www.dailymotion.com/video/%s' % info['id'],
                                ie='Dailymotion')