From e93aaec29b8b572ca4cbb6ed5fda79af1495ea08 Mon Sep 17 00:00:00 2001 From: Wolfgang Müller Date: Fri, 15 Nov 2024 14:20:46 +0100 Subject: backend/plugins: Have E-Hentai raise an error from status_code early This makes the code clearer and saves a whole indentation level. --- src/hircine/plugins/scrapers/ehentai_api.py | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/hircine/plugins/scrapers/ehentai_api.py b/src/hircine/plugins/scrapers/ehentai_api.py index 86b6cfa..e34d80c 100644 --- a/src/hircine/plugins/scrapers/ehentai_api.py +++ b/src/hircine/plugins/scrapers/ehentai_api.py @@ -55,23 +55,23 @@ class EHentaiAPIScraper(Scraper): request = requests.post(API_URL, data=data) - if request.status_code == requests.codes.ok: - try: - response = json.loads(request.text)["gmetadata"][0] - except json.JSONDecodeError as err: - raise ScrapeError("Could not parse JSON response") from err - except (KeyError, IndexError) as err: - raise ScrapeError("Response is missing 'gmetadata' field") from err - - title = response.get("title") - if title: - response["title"] = html.unescape(title) - - title_jpn = response.get("title_jpn") - if title_jpn: - response["title_jpn"] = html.unescape(title_jpn) - - handler = ExHentaiHandler() - yield from handler.scrape(response) - else: + if request.status_code != requests.codes.ok: raise ScrapeError(f"Request failed with status code {request.status_code}") + + try: + response = json.loads(request.text)["gmetadata"][0] + except json.JSONDecodeError as err: + raise ScrapeError("Could not parse JSON response") from err + except (KeyError, IndexError) as err: + raise ScrapeError("Response is missing 'gmetadata' field") from err + + title = response.get("title") + if title: + response["title"] = html.unescape(title) + + title_jpn = response.get("title_jpn") + if title_jpn: + response["title_jpn"] = html.unescape(title_jpn) + + handler = ExHentaiHandler() + yield from handler.scrape(response) -- cgit v1.2.3-2-gb3c3