mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-01 20:16:38 +02:00
[francetv] Add support for zouzous.fr and ludo.fr (closes #10454, closes #13087, closes #13103, closes #15012)
This commit is contained in:
parent
99892e9908
commit
79080573b5
@ -376,6 +376,7 @@
|
|||||||
FranceTVSiteIE,
|
FranceTVSiteIE,
|
||||||
FranceTVEmbedIE,
|
FranceTVEmbedIE,
|
||||||
FranceTVInfoIE,
|
FranceTVInfoIE,
|
||||||
|
FranceTVJeunesseIE,
|
||||||
GenerationWhatIE,
|
GenerationWhatIE,
|
||||||
CultureboxIE,
|
CultureboxIE,
|
||||||
)
|
)
|
||||||
|
@ -20,12 +20,13 @@
|
|||||||
|
|
||||||
|
|
||||||
class FranceTVBaseInfoExtractor(InfoExtractor):
|
class FranceTVBaseInfoExtractor(InfoExtractor):
|
||||||
def _make_url_result(self, video_id, catalog=None):
|
def _make_url_result(self, video_or_full_id, catalog=None):
|
||||||
full_id = 'francetv:%s' % video_id
|
full_id = 'francetv:%s' % video_or_full_id
|
||||||
if catalog:
|
if '@' not in video_or_full_id and catalog:
|
||||||
full_id += '@%s' % catalog
|
full_id += '@%s' % catalog
|
||||||
return self.url_result(
|
return self.url_result(
|
||||||
full_id, ie=FranceTVIE.ie_key(), video_id=video_id)
|
full_id, ie=FranceTVIE.ie_key(),
|
||||||
|
video_id=video_or_full_id.split('@')[0])
|
||||||
|
|
||||||
|
|
||||||
class FranceTVIE(InfoExtractor):
|
class FranceTVIE(InfoExtractor):
|
||||||
@ -431,3 +432,43 @@ def _real_extract(self, url):
|
|||||||
webpage, 'video id').split('@')
|
webpage, 'video id').split('@')
|
||||||
|
|
||||||
return self._make_url_result(video_id, catalogue)
|
return self._make_url_result(video_id, catalogue)
|
||||||
|
|
||||||
|
|
||||||
|
class FranceTVJeunesseIE(FranceTVBaseInfoExtractor):
|
||||||
|
_VALID_URL = r'(?P<url>https?://(?:www\.)?(?:zouzous|ludo)\.fr/heros/(?P<id>[^/?#&]+))'
|
||||||
|
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.zouzous.fr/heros/simon',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'simon',
|
||||||
|
},
|
||||||
|
'playlist_count': 9,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.ludo.fr/heros/ninjago',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'ninjago',
|
||||||
|
},
|
||||||
|
'playlist_count': 10,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.zouzous.fr/heros/simon?abc',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
mobj = re.match(self._VALID_URL, url)
|
||||||
|
playlist_id = mobj.group('id')
|
||||||
|
|
||||||
|
playlist = self._download_json(
|
||||||
|
'%s/%s' % (mobj.group('url'), 'playlist'), playlist_id)
|
||||||
|
|
||||||
|
if not playlist.get('count'):
|
||||||
|
raise ExtractorError(
|
||||||
|
'%s is not available' % playlist_id, expected=True)
|
||||||
|
|
||||||
|
entries = []
|
||||||
|
for item in playlist['items']:
|
||||||
|
identity = item.get('identity')
|
||||||
|
if identity and isinstance(identity, compat_str):
|
||||||
|
entries.append(self._make_url_result(identity))
|
||||||
|
|
||||||
|
return self.playlist_result(entries, playlist_id)
|
||||||
|
Loading…
Reference in New Issue
Block a user