X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdefense.py;h=9fe144e1431941051f3f2b7134fd9eb888522e96;hb=HEAD;hp=963fb897f407f5b266d98343fe8f0b3b6b0ba189;hpb=52afe996656987ad17999212d8a25e12151147a7;p=youtube-dl

diff --git a/youtube_dl/extractor/defense.py b/youtube_dl/extractor/defense.py
index 963fb897f..9fe144e14 100644
--- a/youtube_dl/extractor/defense.py
+++ b/youtube_dl/extractor/defense.py
@@ -1,37 +1,39 @@
-# coding: utf-8
-'''Extractor for defense.gouv.fr'''
-import re
-import json
+from __future__ import unicode_literals
 
 from .common import InfoExtractor
 
 
 class DefenseGouvFrIE(InfoExtractor):
-    '''Extractor for defense.gouv.fr'''
-    _IE_NAME = 'defense.gouv.fr'
-    _VALID_URL = (r'http://.*?\.defense\.gouv\.fr/layout/set/'
-        'ligthboxvideo/base-de-medias/webtv/(.*)')
+    IE_NAME = 'defense.gouv.fr'
+    _VALID_URL = r'https?://.*?\.defense\.gouv\.fr/layout/set/ligthboxvideo/base-de-medias/webtv/(?P<id>[^/?#]*)'
 
     _TEST = {
-        u'url': (u'http://www.defense.gouv.fr/layout/set/ligthboxvideo/',
-        'base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1')
+        'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
+        'md5': '75bba6124da7e63d2d60b5244ec9430c',
+        'info_dict': {
+            'id': '11213',
+            'ext': 'mp4',
+            'title': 'attaque-chimique-syrienne-du-21-aout-2013-1'
+        }
     }
 
     def _real_extract(self, url):
-        title = re.match(self._VALID_URL, url).group(1)
+        title = self._match_id(url)
         webpage = self._download_webpage(url, title)
+
         video_id = self._search_regex(
             r"flashvars.pvg_id=\"(\d+)\";",
             webpage, 'ID')
-        
-        json_url = ('http://static.videos.gouv.fr/brightcovehub/export/json/'
-            + video_id)
-        info = self._download_webpage(json_url, title,
-                                                  'Downloading JSON config')
-        video_url = json.loads(info)['renditions'][0]['url']
-        
-        return {'id': video_id,
-                'ext': 'mp4',
-                'url': video_url,
-                'title': title,
-                }
+
+        json_url = (
+            'http://static.videos.gouv.fr/brightcovehub/export/json/%s' %
+            video_id)
+        info = self._download_json(json_url, title, 'Downloading JSON config')
+        video_url = info['renditions'][0]['url']
+
+        return {
+            'id': video_id,
+            'ext': 'mp4',
+            'url': video_url,
+            'title': title,
+        }