From da77de39d3ea4ecc90e347c5757527153dd4842e Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 8 Sep 2013 22:23:52 +0200 Subject: [PATCH] Let's use the mobile M3U8 file instead --- youtube_dl/extractor/pluzz.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/pluzz.py b/youtube_dl/extractor/pluzz.py index d2bb646a0..794c25c5f 100644 --- a/youtube_dl/extractor/pluzz.py +++ b/youtube_dl/extractor/pluzz.py @@ -9,8 +9,7 @@ class PluzzIE(InfoExtractor): _TEST = { u'url': u'http://pluzz.francetv.fr/videos/doctor_who.html', - u'file': u'12163.mp4', - u'md5': u'060158428b650f896c542dfbb3d6487f' + u'file': u'88444506.mp4' } def _real_extract(self, url): @@ -21,14 +20,18 @@ class PluzzIE(InfoExtractor): video_id = self._search_regex( r'data-diffusion="(\d+)"', webpage, 'ID') - xml_desc = self._download_webpage('http://www.pluzz.fr/appftv/webservices/video/getInfosOeuvre.php?id-diffusion=' + video_id, title, 'Downloading XML config') + xml_desc = self._download_webpage( + 'http://www.pluzz.fr/appftv/webservices/video/' + 'getInfosOeuvre.php?id-diffusion=' + + video_id, title, 'Downloading XML config') - manifest_url = self._search_regex(r'<\!\[CDATA\[(.*?)]]>', xml_desc, re.MULTILINE|re.DOTALL) - - token = self._download_webpage('http://hdfauth.francetv.fr/esi/urltokengen2.html?url=' + manifest_url, title, 'Getting token') + manifest_url = self._search_regex(r'<\!\[CDATA\[(.*?)]]>', + xml_desc, re.MULTILINE|re.DOTALL) + video_url = manifest_url.replace('manifest.f4m', 'index_2_av.m3u8') + video_url = video_url.replace('/z/', '/i/') return {'id': video_id, - 'ext': 'f4m', + 'ext': 'mp4', 'url': video_url, 'title': title, 'thumbnail': thumbnail