mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-06-28 01:18:30 +00:00
Code Issues Projects Releases Wiki Activity

[ie/digiteka] Autoformat reverts and safer object traversal

Browse Source
This commit is contained in:
ElDonad 2025-04-13 11:58:18 +02:00
parent 434f6ff6b9
commit 416af323e9
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
yt_dlp/extractor/digiteka.py
View File

@ -1,5 +1,5 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import int_or_none from ..utils import int_or_none, traverse_obj, url_or_none
class DigitekaIE(InfoExtractor): class DigitekaIE(InfoExtractor):
@ -23,9 +23,7 @@ class DigitekaIE(InfoExtractor):
) )
/id /id
)/(?P<id>[\d+a-z]+)''' )/(?P<id>[\d+a-z]+)'''
_EMBED_REGEX = [ _EMBED_REGEX = [r'<(?:iframe|script)(?:(?!>)[\s\S])*(?:data-)?src=["\'](?P<url>(?:https?:)?//(?:www\.)?(?:digiteka\.net|ultimedia\.com)/deliver/(?P<embed_type>generic|musique)(?:/[^/]+)*/(?:src|article)/(?P<id>[\d+a-z]+))']
r'<(?:iframe|script)(?:(?!>)[\s\S])*(?:data-)?src=["\'](?P<url>(?:https?:)?//(?:www\.)?(?:digiteka\.net|ultimedia\.com)/deliver/(?P<embed_type>generic|musique)(?:/[^/]+)*/(?:src|article)/(?P<id>[\d+a-z]+))',
]
_TESTS = [ _TESTS = [
{ {
'url': 'https://www.ultimedia.com/deliver/generic/iframe/mdtk/01747256/zone/60/src/x8smpxf', 'url': 'https://www.ultimedia.com/deliver/generic/iframe/mdtk/01747256/zone/60/src/x8smpxf',
@ -52,23 +50,13 @@ class DigitekaIE(InfoExtractor):
] ]
def _fallback_to_iframe_content(self, url, video_id): def _fallback_to_iframe_content(self, url, video_id):
iframe_content = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
video_url = self._og_search_video_url(iframe_content)
video_format = video_url.split('.')[-1]
video_title = self._og_search_title(iframe_content)
video_thumbnail = self._og_search_thumbnail(iframe_content)
return { return {
'id': video_id, 'id': video_id,
'title': video_title, 'url': self._og_search_video_url(webpage),
'thumbnail': video_thumbnail, 'title': self._og_search_title(webpage),
'formats': [ 'thumbnail': self._og_search_thumbnail(webpage),
{
'url': video_url,
'ext': video_format,
},
],
} }
def _real_extract(self, url): def _real_extract(self, url):
@ -80,8 +68,7 @@ def _real_extract(self, url):
deliver_info = self._download_json( deliver_info = self._download_json(
f'http://www.ultimedia.com/deliver/video?video={video_id}&topic={video_type}', f'http://www.ultimedia.com/deliver/video?video={video_id}&topic={video_type}',
video_id, video_id)
)
if not deliver_info: if not deliver_info:
return self._fallback_to_iframe_content(url, video_id) return self._fallback_to_iframe_content(url, video_id)
yt_id = deliver_info.get('yt_id') yt_id = deliver_info.get('yt_id')
@ -92,14 +79,13 @@ def _real_extract(self, url):
formats = [] formats = []
for source in jwconf['playlist'][0]['sources']: for source in traverse_obj(jwconf, ('playlist', 0, 'sources', lambda _, v: url_or_none(v['file']))):
if source['file'] is not False: formats.append(
formats.append( {
{ 'url': source['file'],
'url': source['file'], 'format_id': source.get('label'),
'format_id': source.get('label'), },
}, )
)
if not formats: if not formats:
return self._fallback_to_iframe_content(url, video_id) return self._fallback_to_iframe_content(url, video_id)