github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pixiv] improve AJAX error handling (#7896)

Browse Source
This commit is contained in:
Mike Fährmann
2025-07-26 07:33:58 +02:00
parent 4138ac06e2
commit 8e33d0b985
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/extractor/pixiv.py
View File

@@ -232,7 +232,14 @@ class PixivExtractor(Extractor):
def _request_ajax(self, endpoint): def _request_ajax(self, endpoint):
url = f"{self.root}/ajax{endpoint}" url = f"{self.root}/ajax{endpoint}"
try: try:
return self.request_json(url, headers=self.headers_web)["body"] data = self.request_json(
url, headers=self.headers_web, fatal=False)
if not data.get("error"):
return data["body"]
self.log.debug("Server response: %s", util.json_dumps(data))
return self.log.error(
"'%s'", data.get("message") or "General Error")
except Exception: except Exception:
return None return None
@@ -437,6 +444,8 @@ class PixivArtworksExtractor(PixivExtractor):
if self.sanity_workaround: if self.sanity_workaround:
body = self._request_ajax( body = self._request_ajax(
f"/user/{self.user_id}/profile/all") f"/user/{self.user_id}/profile/all")
if not body:
return ()
try: try:
ajax_ids = list(map(int, body["illusts"])) ajax_ids = list(map(int, body["illusts"]))
ajax_ids.extend(map(int, body["manga"])) ajax_ids.extend(map(int, body["manga"]))