Merge fd311fb1e3 into e1b3fa242c

Improve error handling logic, follow code conventions
Raise descriptive ExtractorError
2025-01-26 13:20:10 +09:00 · 2024-07-28 01:18:14 +09:00 · 2021-01-27 17:01:25 -05:00 · 2021-01-22 02:33:35 -05:00
1 changed files with 9 additions and 2 deletions
--- a/youtube_dl/extractor/funimation.py
+++ b/youtube_dl/extractor/funimation.py
@ -114,11 +114,18 @@ class FunimationIE(InfoExtractor):
            headers = {}
            if self._TOKEN:
                headers['Authorization'] = 'Token %s' % self._TOKEN
-            sources = self._download_json(
+            meta = self._download_json(
                'https://www.funimation.com/api/showexperience/%s/' % video_id,
                video_id, headers=headers, query={
                    'pinst_id': ''.join([random.choice(string.digits + string.ascii_letters) for _ in range(8)]),
-                })['items']
+                })
+            sources = meta.get('items') or []
+            errors = meta.get('errors')
+            if errors:
+                if isinstance(errors, list):
+                    raise ExtractorError('\nERROR: '.join([error.get('detail') or error.get('title') or str(error) for error in errors]), expected=True)
+                else:
+                    raise ExtractorError(errors, expected=True)
        except ExtractorError as e:
            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
                error = self._parse_json(e.cause.read(), video_id)['errors'][0]
Author	SHA1	Message	Date
NobleKangaroo	0603823110	Merge `fd311fb1e3` into `e1b3fa242c`	2024-07-28 01:18:14 +09:00
NobleKangaroo	fd311fb1e3	Improve error handling logic, follow code conventions	2021-01-27 17:01:25 -05:00
NobleKangaroo	4ecbc49a15	Raise descriptive ExtractorError	2021-01-22 02:33:35 -05:00