From b24df895ff665d23cd9ff47bb20d0229ca95f168 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 4 Jan 2020 17:06:20 +0100 Subject: [PATCH] pending-fixes --- youtube_dl/extractor/lemonde.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/youtube_dl/extractor/lemonde.py b/youtube_dl/extractor/lemonde.py index 869e115b1..ef2d0b824 100644 --- a/youtube_dl/extractor/lemonde.py +++ b/youtube_dl/extractor/lemonde.py @@ -49,16 +49,14 @@ class LemondeIE(InfoExtractor): display_id = self._match_id(url) webpage = self._download_webpage(url, display_id) + digiteka_url = self._proto_relative_url(self._search_regex(r'url\s*:\s*(["\'])(?P(?:https?://)?//(?:www\.)?(?:digiteka\.net|ultimedia\.com)/deliver/.+?)\1',webpage, 'digiteka url', group='url', default=None)) + if digiteka_url: + return self.url_result(digiteka_url, 'Digiteka') + mobj = re.search(r'data-id="(?P.+)" data-provider="(?P[^ ]+)"', webpage) - video_id = mobj.group('id') - provider = mobj.group('provider') + video_id = mobj.group('id') if mobj else display_id + provider = mobj.group('provider') if mobj else "" - if(provider not in self._PROVIDERS): - raise ExtractorError('Unsupported provider ' % provider) + embeded_url = self._PROVIDERS.get(provider, "{}").format(video_id) - embeded_url = self._PROVIDERS.get(provider, "").format(video_id) - - return { - '_type': 'url', - 'url': embeded_url - } + return self.url_result(embeded_url, video_id=video_id)