commit 23d9ded655f45c5a21c8d93ad167a072322ae88f
parent 4c1a017e6961c18fdef13d49bcdd0daa08ab0575
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 3 Feb 2015 10:15:05 +0100
[franceculture] Rewrite for new HTML scheme (Fixes #4853)
Diffstat:
2 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/test/helper.py b/test/helper.py
@@ -103,6 +103,16 @@ def expect_info_dict(self, got_dict, expected_dict):
self.assertTrue(
match_rex.match(got),
'field %s (value: %r) should match %r' % (info_field, got, match_str))
+ elif isinstance(expected, compat_str) and expected.startswith('startswith:'):
+ got = got_dict.get(info_field)
+ start_str = expected[len('startswith:'):]
+ self.assertTrue(
+ isinstance(got, compat_str),
+ 'Expected a %s object, but got %s for field %s' % (
+ compat_str.__name__, type(got).__name__, info_field))
+ self.assertTrue(
+ got.startswith(start_str),
+ 'field %s (value: %r) should start with %r' % (info_field, got, start_str))
elif isinstance(expected, type):
got = got_dict.get(info_field)
self.assertTrue(isinstance(got, expected),
diff --git a/youtube_dl/extractor/franceculture.py b/youtube_dl/extractor/franceculture.py
@@ -1,77 +1,69 @@
# coding: utf-8
from __future__ import unicode_literals
-import json
-import re
-
from .common import InfoExtractor
from ..compat import (
- compat_parse_qs,
compat_urlparse,
)
+from ..utils import (
+ determine_ext,
+ int_or_none,
+)
class FranceCultureIE(InfoExtractor):
- _VALID_URL = r'(?P<baseurl>http://(?:www\.)?franceculture\.fr/)player/reecouter\?play=(?P<id>[0-9]+)'
+ _VALID_URL = r'https?://(?:www\.)?franceculture\.fr/player/reecouter\?play=(?P<id>[0-9]+)'
_TEST = {
'url': 'http://www.franceculture.fr/player/reecouter?play=4795174',
'info_dict': {
'id': '4795174',
'ext': 'mp3',
'title': 'Rendez-vous au pays des geeks',
+ 'alt_title': 'Carnet nomade | 13-14',
'vcodec': 'none',
- 'uploader': 'Colette Fellous',
'upload_date': '20140301',
- 'duration': 3601,
'thumbnail': r're:^http://www\.franceculture\.fr/.*/images/player/Carnet-nomade\.jpg$',
- 'description': 'Avec :Jean-Baptiste Péretié pour son documentaire sur Arte "La revanche des « geeks », une enquête menée aux Etats-Unis dans la S ...',
+ 'description': 'startswith:Avec :Jean-Baptiste Péretié pour son documentaire sur Arte "La revanche des « geeks », une enquête menée aux Etats',
+ 'timestamp': 1393700400,
}
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
- baseurl = mobj.group('baseurl')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- params_code = self._search_regex(
- r"<param name='movie' value='/sites/all/modules/rf/rf_player/swf/loader.swf\?([^']+)' />",
- webpage, 'parameter code')
- params = compat_parse_qs(params_code)
- video_url = compat_urlparse.urljoin(baseurl, params['urlAOD'][0])
+
+ video_path = self._search_regex(
+ r'<a id="player".*?href="([^"]+)"', webpage, 'video path')
+ video_url = compat_urlparse.urljoin(url, video_path)
+ timestamp = int_or_none(self._search_regex(
+ r'<a id="player".*?data-date="([0-9]+)"',
+ webpage, 'upload date', fatal=False))
+ thumbnail = self._search_regex(
+ r'<a id="player".*?>\s+<img src="([^"]+)"',
+ webpage, 'thumbnail', fatal=False)
title = self._html_search_regex(
- r'<h1 class="title[^"]+">(.+?)</h1>', webpage, 'title')
- uploader = self._html_search_regex(
- r'(?s)<div id="emission".*?<span class="author">(.*?)</span>',
- webpage, 'uploader', fatal=False)
- thumbnail_part = self._html_search_regex(
- r'(?s)<div id="emission".*?<img src="([^"]+)"', webpage,
- 'thumbnail', fatal=False)
- if thumbnail_part is None:
- thumbnail = None
- else:
- thumbnail = compat_urlparse.urljoin(baseurl, thumbnail_part)
+ r'<span class="title-diffusion">(.*?)</span>', webpage, 'title')
+ alt_title = self._html_search_regex(
+ r'<span class="title">(.*?)</span>',
+ webpage, 'alt_title', fatal=False)
description = self._html_search_regex(
- r'(?s)<p class="desc">(.*?)</p>', webpage, 'description')
+ r'<span class="description">(.*?)</span>',
+ webpage, 'description', fatal=False)
- info = json.loads(params['infoData'][0])[0]
- duration = info.get('media_length')
- upload_date_candidate = info.get('media_section5')
- upload_date = (
- upload_date_candidate
- if (upload_date_candidate is not None and
- re.match(r'[0-9]{8}$', upload_date_candidate))
- else None)
+ uploader = self._html_search_regex(
+ r'(?s)<div id="emission".*?<span class="author">(.*?)</span>',
+ webpage, 'uploader', default=None)
+ vcodec = 'none' if determine_ext(video_url.lower()) == 'mp3' else None
return {
'id': video_id,
'url': video_url,
- 'vcodec': 'none' if video_url.lower().endswith('.mp3') else None,
- 'duration': duration,
+ 'vcodec': vcodec,
'uploader': uploader,
- 'upload_date': upload_date,
+ 'timestamp': timestamp,
'title': title,
+ 'alt_title': alt_title,
'thumbnail': thumbnail,
'description': description,
}
