mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-17 18:58:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge 20837703be into c1ac543c81

Browse Source
This commit is contained in:
ocococococ 2025-07-16 19:24:40 -04:00 committed by GitHub
commit 4721e6926e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yt_dlp/extractor/lci.py
View File

@ -1,6 +1,6 @@
from .common import InfoExtractor from .common import InfoExtractor
from .wat import WatIE from .wat import WatIE
from ..utils import ExtractorError, int_or_none from ..utils import ExtractorError, str_or_none
from ..utils.traversal import traverse_obj from ..utils.traversal import traverse_obj
@ -19,10 +19,11 @@ class LCIIE(InfoExtractor):
'params': { 'params': {
'skip_download': True, 'skip_download': True,
}, },
'skip': 'This content is no longer available',
}, { }, {
'url': 'https://www.tf1info.fr/politique/election-presidentielle-2022-second-tour-j-2-marine-le-pen-et-emmanuel-macron-en-interview-de-lci-vendredi-soir-2217486.html', 'url': 'https://www.tf1info.fr/politique/election-presidentielle-2022-second-tour-j-2-marine-le-pen-et-emmanuel-macron-en-interview-de-lci-vendredi-soir-2217486.html',
'info_dict': { 'info_dict': {
'id': '13875948', 'id': 'c5647202-4549-4644-a892-1976e78fc5f8',
'ext': 'mp4', 'ext': 'mp4',
'title': 'md5:660df5481fd418bc3bbb0d070e6fdb5a', 'title': 'md5:660df5481fd418bc3bbb0d070e6fdb5a',
'thumbnail': 'https://photos.tf1.fr/1280/720/presidentielle-2022-marine-le-pen-et-emmanuel-macron-invites-de-lci-ce-vendredi-9c0e73-e1a036-0@1x.jpg', 'thumbnail': 'https://photos.tf1.fr/1280/720/presidentielle-2022-marine-le-pen-et-emmanuel-macron-invites-de-lci-ce-vendredi-9c0e73-e1a036-0@1x.jpg',
@ -33,8 +34,18 @@ class LCIIE(InfoExtractor):
'skip_download': True, 'skip_download': True,
}, },
}, { }, {
'url': 'https://www.lci.fr/politique/election-presidentielle-2022-second-tour-j-2-marine-le-pen-et-emmanuel-macron-en-interview-de-lci-vendredi-soir-2217486.html', 'url': 'https://www.tf1info.fr/replay-lci/videos/video-24h-pujadas-du-mercredi-2-juillet-2025-73777-2380589.html',
'only_matching': True, 'info_dict': {
'id': 'f0550853-c949-4e0e-8ba4-8237cbb512af',
'ext': 'mp4',
'title': '24H Pujadas du mercredi 2 juillet 2025',
'thumbnail': 'https://photos.tf1.fr/1280/720/24h-pujadas-du-mercredi-2-juillet-2025-394752-0@1x.jpg',
'upload_date': '20250702',
'duration': 5866,
},
'params': {
'skip_download': True,
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -42,7 +53,7 @@ def _real_extract(self, url):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
next_data = self._search_nextjs_data(webpage, video_id) next_data = self._search_nextjs_data(webpage, video_id)
wat_id = traverse_obj(next_data, ( wat_id = traverse_obj(next_data, (
'props', 'pageProps', 'page', 'tms', 'videos', {dict.keys}, ..., {int_or_none}, any)) 'props', 'pageProps', 'page', 'tms', 'videos', {dict.keys}, ..., {str_or_none}, any))
if wat_id is None: if wat_id is None:
raise ExtractorError('Could not find wat_id') raise ExtractorError('Could not find wat_id')

24
yt_dlp/extractor/wat.py
View File

@ -10,7 +10,8 @@
class WatIE(InfoExtractor): class WatIE(InfoExtractor):
_VALID_URL = r'(?:wat:|https?://(?:www\.)?wat\.tv/video/.*-)(?P<id>[0-9a-z]+)' _UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
_VALID_URL = rf'(?:wat:|https?://(?:www\.)?wat\.tv/video/.*-)(?P<id>{_UUID_RE}|[0-9]{{7,}}|(?:[a-z0-9]+_){{2}}|(?P<b36>[0-9a-z]+))(?:$|\.html|[#?/])'
IE_NAME = 'wat.tv' IE_NAME = 'wat.tv'
_TESTS = [ _TESTS = [
{ {
@ -53,13 +54,30 @@ class WatIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
}, },
'params': {'skip_download': 'm3u8'}, 'params': {'skip_download': 'm3u8'},
'expected_warnings': ["Ce contenu n'est pas disponible"],
'skip': 'This content is no longer available',
},
{
'url': 'wat:f0550853-c949-4e0e-8ba4-8237cbb512af',
'info_dict': {
'id': 'f0550853-c949-4e0e-8ba4-8237cbb512af',
'ext': 'mp4',
'title': '24H Pujadas du mercredi 2 juillet 2025',
'thumbnail': 'https://photos.tf1.fr/1280/720/24h-pujadas-du-mercredi-2-juillet-2025-394752-0@1x.jpg',
'upload_date': '20250702',
'duration': 5866,
},
'params': {
'skip_download': True,
},
}, },
] ]
_GEO_BYPASS = False _GEO_BYPASS = False
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id, b36_id = self._match_valid_url(url).group('id', 'b36')
video_id = video_id if video_id.isdigit() and len(video_id) > 6 else str(int(video_id, 36)) if b36_id:
video_id = str(int(video_id, 36))
# 'contentv4' is used in the website, but it also returns the related # 'contentv4' is used in the website, but it also returns the related
# videos, we don't need them # videos, we don't need them