浏览代码

Made optional fields optional

Philip Xu 9 年之前
父节点
当前提交
2e638d7bca
共有 1 个文件被更改,包括 8 次插入5 次删除
  1. 8 5
      youtube_dl/extractor/huajiao.py

+ 8 - 5
youtube_dl/extractor/huajiao.py

@@ -36,15 +36,18 @@ class HuajiaoIE(InfoExtractor):
         description = self._html_search_meta(
         description = self._html_search_meta(
             'description', webpage, 'description', fatal=False)
             'description', webpage, 'description', fatal=False)
 
 
+        def get(section, field):
+            return feed.get(section, {}).get(field)
+
         return {
         return {
             'id': video_id,
             'id': video_id,
             'title': feed['feed']['formated_title'],
             'title': feed['feed']['formated_title'],
             'description': description,
             'description': description,
-            'duration': parse_duration(feed['feed']['duration']),
-            'thumbnail': feed['feed']['image'],
-            'timestamp': parse_iso8601(feed['creatime'], ' '),
-            'uploader': feed['author']['nickname'],
-            'uploader_id': feed['author']['uid'],
+            'duration': parse_duration(get('feed', 'duration')),
+            'thumbnail': get('feed', 'image'),
+            'timestamp': parse_iso8601(feed.get('creatime'), ' '),
+            'uploader': get('author', 'nickname'),
+            'uploader_id': get('author', 'uid'),
             'formats': self._extract_m3u8_formats(
             'formats': self._extract_m3u8_formats(
                 feed['feed']['m3u8'], video_id, 'mp4', 'm3u8_native'),
                 feed['feed']['m3u8'], video_id, 'mp4', 'm3u8_native'),
         }
         }