]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[LiveLeak] Check if the original videos exist (closes #21206) (#21208)
authorbitraid <bitraid@protonmail.ch>
Tue, 28 May 2019 12:31:11 +0000 (15:31 +0300)
committerremitamine <remitamine@gmail.com>
Tue, 28 May 2019 12:31:11 +0000 (12:31 +0000)
youtube_dl/extractor/liveleak.py

index 5df14bb41c8786111bc4cda6ac849dca96811f59..4ac437c8b7a4b4affd6a9a2175dc807e4e964f7f 100644 (file)
@@ -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,13 @@ 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,
-                    })
+                    format_id = 'original' + ('-' + format_id if format_id else '')
+                    if self._is_valid_url(orig_url, video_id, format_id):
+                        formats.append({
+                            'format_id': format_id,
+                            'url': orig_url,
+                            'preference': 1,
+                        })
             self._sort_formats(formats)
             info_dict['formats'] = formats