X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffranceinter.py;h=fdc51f44fe3fde67f5d9d847994fb94ab383a3e1;hb=9f0ee2a3883ec6f6fdccba90085cb925aaa2f617;hp=47e06f5a1ada8a976a7988b438e0fd06115cc799;hpb=bf6705f5840418999582c6cf5cc0e2e47901cf4f;p=youtube-dl

diff --git a/youtube_dl/extractor/franceinter.py b/youtube_dl/extractor/franceinter.py
index 47e06f5a1..fdc51f44f 100644
--- a/youtube_dl/extractor/franceinter.py
+++ b/youtube_dl/extractor/franceinter.py
@@ -1,40 +1,49 @@
-import re
+# coding: utf-8
+from __future__ import unicode_literals
 
 from .common import InfoExtractor
+from ..utils import int_or_none
+
+
 class FranceInterIE(InfoExtractor):
-    
-    _VALID_URL=r'http://www.franceinter.fr/player/reecouter\?play=(?P<id>[0-9]{6})'
-    IE_NAME='FranceInter'
-    _TEST={
-           u'url':u'http://www.franceinter.fr/player/reecouter?play=793962',
-           u'file':u'793962.mp3'
-           
-           
-           }
-           
-    #Easier to use python string matching than regex for a simple match
-    def get_download_url(self,webpage):
-        
-        start=webpage.index('&urlAOD=')+8
-        end=webpage.index('&startTime')
-        return u'http://www.franceinter.fr/%s'%webpage[start:end]
-        
-    def get_title(self,webpage):
-        start=webpage.index('<span class="title diffusion">')+30
-        end=webpage.index('</span> dans')
-        
-        return webpage[start:end]
-    def _real_extract(self,url):
-
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-        
-        webpage=self._download_webpage(url,video_id)
-        
-        title=self.get_title(webpage)
-        
-        video_url=self.get_download_url(webpage)
-        
-        return{'id': video_id,u'url': video_url,u'title': title}
-        
-        
+    _VALID_URL = r'http://(?:www\.)?franceinter\.fr/player/reecouter\?play=(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'http://www.franceinter.fr/player/reecouter?play=793962',
+        'md5': '4764932e466e6f6c79c317d2e74f6884',
+        "info_dict": {
+            'id': '793962',
+            'ext': 'mp3',
+            'title': 'L’Histoire dans les jeux vidéo',
+            'description': 'md5:7e93ddb4451e7530022792240a3049c7',
+            'timestamp': 1387369800,
+            'upload_date': '20131218',
+        },
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(url, video_id)
+
+        path = self._search_regex(
+            r'<a id="player".+?href="([^"]+)"', webpage, 'video url')
+        video_url = 'http://www.franceinter.fr/' + path
+
+        title = self._html_search_regex(
+            r'<span class="title-diffusion">(.+?)</span>', webpage, 'title')
+        description = self._html_search_regex(
+            r'<span class="description">(.*?)</span>',
+            webpage, 'description', fatal=False)
+        timestamp = int_or_none(self._search_regex(
+            r'data-date="(\d+)"', webpage, 'upload date', fatal=False))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'description': description,
+            'timestamp': timestamp,
+            'formats': [{
+                'url': video_url,
+                'vcodec': 'none',
+            }],
+        }