浏览代码

[LiveLeak] Check if the original videos exist (closes #21206) (#21208)

bitraid 6 年之前
父节点
当前提交
33b2218b2f
共有 1 个文件被更改,包括 11 次插入5 次删除
  1. 11 5
      youtube_dl/extractor/liveleak.py

+ 11 - 5
youtube_dl/extractor/liveleak.py

@@ -82,6 +82,10 @@ class LiveLeakIE(InfoExtractor):
     }, {
     }, {
         'url': 'https://www.liveleak.com/view?t=HvHi_1523016227',
         'url': 'https://www.liveleak.com/view?t=HvHi_1523016227',
         'only_matching': True,
         'only_matching': True,
+    }, {
+        # No original video
+        'url': 'https://www.liveleak.com/view?t=C26ZZ_1558612804',
+        'only_matching': True,
     }]
     }]
 
 
     @staticmethod
     @staticmethod
@@ -134,11 +138,13 @@ class LiveLeakIE(InfoExtractor):
                 orig_url = re.sub(r'\.mp4\.[^.]+', '', a_format['url'])
                 orig_url = re.sub(r'\.mp4\.[^.]+', '', a_format['url'])
                 if a_format['url'] != orig_url:
                 if a_format['url'] != orig_url:
                     format_id = a_format.get('format_id')
                     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)
             self._sort_formats(formats)
             info_dict['formats'] = formats
             info_dict['formats'] = formats