Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-10 21:02:31 +01:00
Code Issues Projects Releases Wiki Activity

Improve error handling logic, follow code conventions

Browse Source
This commit is contained in:
NobleKangaroo 2021-01-27 17:01:25 -05:00
parent 4ecbc49a15
commit fd311fb1e3
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/funimation.py
View File

@ -110,24 +110,18 @@ class FunimationIE(InfoExtractor):
headers = {} headers = {}
if self._TOKEN: if self._TOKEN:
headers['Authorization'] = 'Token %s' % self._TOKEN headers['Authorization'] = 'Token %s' % self._TOKEN
try: meta = self._download_json(
sources = self._download_json(
'https://www.funimation.com/api/showexperience/%s/' % video_id, 'https://www.funimation.com/api/showexperience/%s/' % video_id,
video_id, headers=headers, query={ video_id, headers=headers, query={
'pinst_id': ''.join([random.choice(string.digits + string.ascii_letters) for _ in range(8)]), 'pinst_id': ''.join([random.choice(string.digits + string.ascii_letters) for _ in range(8)]),
}) })
sources = sources['items'] sources = meta.get('items') or []
except KeyError: errors = meta.get('errors')
if 'errors' in sources: if errors:
errors = sources['errors'] if isinstance(errors, list):
if len(errors) > 0: raise ExtractorError('\nERROR: '.join([error.get('detail') or error.get('title') or str(error) for error in errors]), expected=True)
error = errors[0]
if 'detail' in error:
detail = error['detail']
raise ExtractorError('%s said: %s' % (
self.IE_NAME, detail), expected=True)
else: else:
raise ExtractorError(error, expected=True) raise ExtractorError(errors, expected=True)
except ExtractorError as e: except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403: if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
error = self._parse_json(e.cause.read(), video_id)['errors'][0] error = self._parse_json(e.cause.read(), video_id)['errors'][0]