From f4b37e327d5dde7dde55f3ffae206265e5f460f9 Mon Sep 17 00:00:00 2001 From: bitraid Date: Fri, 24 May 2019 17:42:31 +0300 Subject: [PATCH 1/2] [LiveLeak] Check if the original videos exist (closes #21206) --- youtube_dl/extractor/liveleak.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index 5df14bb41..5d0725249 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -82,6 +82,10 @@ class LiveLeakIE(InfoExtractor): }, { 'url': 'https://www.liveleak.com/view?t=HvHi_1523016227', 'only_matching': True, + }, { + # No original video + 'url': 'https://www.liveleak.com/view?t=C26ZZ_1558612804', + 'only_matching': True, }] @staticmethod @@ -134,11 +138,12 @@ class LiveLeakIE(InfoExtractor): orig_url = re.sub(r'\.mp4\.[^.]+', '', a_format['url']) if a_format['url'] != orig_url: format_id = a_format.get('format_id') - formats.append({ - 'format_id': 'original' + ('-' + format_id if format_id else ''), - 'url': orig_url, - 'preference': 1, - }) + if self._is_valid_url(orig_url, video_id, format_id): + formats.append({ + 'format_id': 'original' + ('-' + format_id if format_id else ''), + 'url': orig_url, + 'preference': 1, + }) self._sort_formats(formats) info_dict['formats'] = formats From 9ac2735305c7ac55459f0a18559c85d9f0c6e796 Mon Sep 17 00:00:00 2001 From: bitraid Date: Tue, 28 May 2019 13:25:57 +0300 Subject: [PATCH 2/2] [LiveLeak] format_id fallback for _is_valid_url --- youtube_dl/extractor/liveleak.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index 5d0725249..4ac437c8b 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -138,9 +138,10 @@ class LiveLeakIE(InfoExtractor): orig_url = re.sub(r'\.mp4\.[^.]+', '', a_format['url']) if a_format['url'] != orig_url: format_id = a_format.get('format_id') + format_id = 'original' + ('-' + format_id if format_id else '') if self._is_valid_url(orig_url, video_id, format_id): formats.append({ - 'format_id': 'original' + ('-' + format_id if format_id else ''), + 'format_id': format_id, 'url': orig_url, 'preference': 1, })