From f4c7ef98624bd407a8f8f91215cb95a2c5db9472 Mon Sep 17 00:00:00 2001 From: remitamine Date: Sat, 28 Nov 2015 18:20:44 +0100 Subject: [PATCH] [skynewsarabia] return empty categories array if there is no topic --- youtube_dl/extractor/skynewsarabia.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/skynewsarabia.py b/youtube_dl/extractor/skynewsarabia.py index d1c7370207..f09fee102c 100644 --- a/youtube_dl/extractor/skynewsarabia.py +++ b/youtube_dl/extractor/skynewsarabia.py @@ -23,6 +23,7 @@ def _get_image_url(self, image_path_template, width='1600', height='1200'): def _extract_video_info(self, video_data): video_id = compat_str(video_data['id']) + topic = video_data.get('topicTitle') return { '_type': 'url_transparent', 'url': 'limelight:media:%s' % self._get_limelight_media_id(video_data['videoUrl'][0]['url']), @@ -32,8 +33,8 @@ def _extract_video_info(self, video_data): 'thumbnail': self._get_image_url(video_data['mediaAsset']['imageUrl']), 'timestamp': parse_iso8601(video_data.get('date')), 'duration': parse_duration(video_data.get('runTime')), - 'tags': video_data.get('tags'), - 'categories': [video_data.get('topicTitle')], + 'tags': video_data.get('tags', []), + 'categories': [topic] if topic else [], 'webpage_url': 'http://www.skynewsarabia.com/web/video/%s' % video_id, 'ie_key': 'LimelightMedia', } @@ -98,6 +99,7 @@ def _real_extract(self, url): article_data = self._call_api('article', article_id) media_asset = article_data['mediaAsset'] if media_asset['type'] == 'VIDEO': + topic = article_data.get('topicTitle') return { '_type': 'url_transparent', 'url': 'limelight:media:%s' % self._get_limelight_media_id(media_asset['videoUrl'][0]['url']), @@ -106,8 +108,8 @@ def _real_extract(self, url): 'description': article_data.get('summary'), 'thumbnail': self._get_image_url(media_asset['imageUrl']), 'timestamp': parse_iso8601(article_data.get('date')), - 'tags': article_data.get('tags'), - 'categories': [article_data.get('topicTitle')], + 'tags': article_data.get('tags', []), + 'categories': [topic] if topic else [], 'webpage_url': url, 'ie_key': 'LimelightMedia', }