replaced remaining data[key] with data.get(key)

This commit is contained in:
Christian Pointner 2016-09-02 02:51:02 +02:00
parent fc75a2d468
commit c7eb72b397

View File

@ -68,22 +68,22 @@ class CBAIE(InfoExtractor):
media_result = self._download_json(api_media_url, video_id, 'query media api-endpoint%s' % api_key_msg, media_result = self._download_json(api_media_url, video_id, 'query media api-endpoint%s' % api_key_msg,
'unable to qeury media api-endpoint%s' % api_key_msg, encoding='utf-8-sig') 'unable to qeury media api-endpoint%s' % api_key_msg, encoding='utf-8-sig')
for media in media_result: for media in media_result:
try: url = media.get('source_url')
url = media['source_url'] if not url:
if not url: continue
continue
ft = media['mime_type'] ft = media.get('mime_type')
f = { 'url': url, 'format': ft, 'format_id': self._FORMATS[ft]['id'], 'preference': self._FORMATS[ft]['preference'] } if not ft or not self._FORMATS.get(ft):
media_details = media.get('media_details') continue
if media_details:
f['filesize'] = int_or_none(media_details.get('filesize'))
f['abr'] = int_or_none(media_details.get('bitrate'), 1000)
f['asr'] = int_or_none(media_details.get('sample_rate'))
formats.append(f) f = { 'url': url, 'format': ft, 'format_id': self._FORMATS[ft]['id'], 'preference': self._FORMATS[ft]['preference'] }
except KeyError: media_details = media.get('media_details')
pass if media_details:
f['filesize'] = int_or_none(media_details.get('filesize'))
f['abr'] = int_or_none(media_details.get('bitrate'), 1000)
f['asr'] = int_or_none(media_details.get('sample_rate'))
formats.append(f)
if not formats: if not formats:
if api_key: if api_key: