浏览代码

[YoutubeDL] Return early when extraction of url_transparent fails

Sergey M․ 8 年之前
父节点
当前提交
1640eb0961
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      youtube_dl/YoutubeDL.py

+ 6 - 0
youtube_dl/YoutubeDL.py

@@ -837,6 +837,12 @@ class YoutubeDL(object):
                 ie_result['url'], ie_key=ie_result.get('ie_key'),
                 ie_result['url'], ie_key=ie_result.get('ie_key'),
                 extra_info=extra_info, download=False, process=False)
                 extra_info=extra_info, download=False, process=False)
 
 
+            # extract_info may return None when ignoreerrors is enabled and
+            # extraction failed with an error, don't crash and return early
+            # in this case
+            if not info:
+                return info
+
             force_properties = dict(
             force_properties = dict(
                 (k, v) for k, v in ie_result.items() if v is not None)
                 (k, v) for k, v in ie_result.items() if v is not None)
             for f in ('_type', 'url', 'ie_key'):
             for f in ('_type', 'url', 'ie_key'):