projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[compat] Introduce compat_cookiejar_Cookie
[youtube-dl]
/
youtube_dl
/
extractor
/
francetv.py
diff --git
a/youtube_dl/extractor/francetv.py
b/youtube_dl/extractor/francetv.py
index 2ffe83a78c49b8e6b7436642febb72f66567068d..81b468c7d1e030f7ba67fed2a7ef2562c8164c76 100644
(file)
--- a/
youtube_dl/extractor/francetv.py
+++ b/
youtube_dl/extractor/francetv.py
@@
-143,7
+143,7
@@
class FranceTVIE(InfoExtractor):
ext = determine_ext(video_url)
if ext == 'f4m':
if georestricted:
ext = determine_ext(video_url)
if ext == 'f4m':
if georestricted:
- # See https://github.com/
rg3
/youtube-dl/issues/3963
+ # See https://github.com/
ytdl-org
/youtube-dl/issues/3963
# m3u8 urls work fine
continue
formats.extend(self._extract_f4m_formats(
# m3u8 urls work fine
continue
formats.extend(self._extract_f4m_formats(
@@
-215,7
+215,7
@@
class FranceTVSiteIE(FranceTVBaseInfoExtractor):
_TESTS = [{
'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
'info_dict': {
_TESTS = [{
'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
'info_dict': {
- 'id': '
162311093
',
+ 'id': '
ec217ecc-0733-48cf-ac06-af1347b849d1
',
'ext': 'mp4',
'title': '13h15, le dimanche... - Les mystères de Jésus',
'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
'ext': 'mp4',
'title': '13h15, le dimanche... - Les mystères de Jésus',
'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
@@
-271,7
+271,7
@@
class FranceTVSiteIE(FranceTVBaseInfoExtractor):
catalogue = None
video_id = self._search_regex(
catalogue = None
video_id = self._search_regex(
- r'
data-main-video=
(["\'])(?P<id>(?:(?!\1).)+)\1',
+ r'
(?:data-main-video\s*=|videoId["\']?\s*[:=])\s*
(["\'])(?P<id>(?:(?!\1).)+)\1',
webpage, 'video id', default=None, group='id')
if not video_id:
webpage, 'video id', default=None, group='id')
if not video_id:
@@
-371,12
+371,13
@@
class FranceTVInfoIE(FranceTVBaseInfoExtractor):
self.url_result(dailymotion_url, DailymotionIE.ie_key())
for dailymotion_url in dailymotion_urls])
self.url_result(dailymotion_url, DailymotionIE.ie_key())
for dailymotion_url in dailymotion_urls])
- video_id, catalogue = self._search_regex(
- (r'id-video=([^@]+@[^"]+)',
+ video_id = self._search_regex(
+ (r'player\.load[^;]+src:\s*["\']([^"\']+)',
+ r'id-video=([^@]+@[^"]+)',
r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"'),
r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"'),
- webpage, 'video id')
.split('@')
+ webpage, 'video id')
- return self._make_url_result(video_id
, catalogue
)
+ return self._make_url_result(video_id)
class FranceTVInfoSportIE(FranceTVBaseInfoExtractor):
class FranceTVInfoSportIE(FranceTVBaseInfoExtractor):