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

[pixiv] distinguish empty from deleted profiles (#8066)

Browse Source 
fixes regression introduced in d5e2fe4f44
This commit is contained in:
Mike Fährmann
2025-08-17 10:36:39 +02:00
parent 7dbd3e40f7
commit c71766e6ab
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gallery_dl/extractor/pixiv.py
View File

@@ -1251,9 +1251,9 @@ class PixivAppAPI():
"/v1/user/bookmark-tags/illust", params, "bookmark_tags") "/v1/user/bookmark-tags/illust", params, "bookmark_tags")
@memcache(keyarg=1) @memcache(keyarg=1)
def user_detail(self, user_id): def user_detail(self, user_id, fatal=True):
params = {"user_id": user_id} params = {"user_id": user_id}
return self._call("/v1/user/detail", params) return self._call("/v1/user/detail", params, fatal=fatal)
def user_following(self, user_id, restrict="public"): def user_following(self, user_id, restrict="public"):
params = {"user_id": user_id, "restrict": restrict} params = {"user_id": user_id, "restrict": restrict}
@@ -1261,7 +1261,7 @@ class PixivAppAPI():
def user_illusts(self, user_id): def user_illusts(self, user_id):
params = {"user_id": user_id} params = {"user_id": user_id}
return self._pagination("/v1/user/illusts", params, user_data="user") return self._pagination("/v1/user/illusts", params, key_user="user")
def user_novels(self, user_id): def user_novels(self, user_id):
params = {"user_id": user_id} params = {"user_id": user_id}
@@ -1271,7 +1271,7 @@ class PixivAppAPI():
params = {"illust_id": illust_id} params = {"illust_id": illust_id}
return self._call("/v1/ugoira/metadata", params)["ugoira_metadata"] return self._call("/v1/ugoira/metadata", params)["ugoira_metadata"]
def _call(self, endpoint, params=None, parse=None): def _call(self, endpoint, params=None, parse=None, fatal=True):
url = "https://app-api.pixiv.net" + endpoint url = "https://app-api.pixiv.net" + endpoint
while True: while True:
@@ -1283,7 +1283,7 @@ class PixivAppAPI():
else: else:
data = response.json() data = response.json()
if "error" not in data: if "error" not in data or not fatal:
return data return data
self.log.debug(data) self.log.debug(data)
@@ -1302,14 +1302,16 @@ class PixivAppAPI():
raise exception.AbortExtraction(f"API request failed: {msg}") raise exception.AbortExtraction(f"API request failed: {msg}")
def _pagination(self, endpoint, params, def _pagination(self, endpoint, params,
key_items="illusts", key_data=None, user_data=None): key_items="illusts", key_data=None, key_user=None):
data = self._call(endpoint, params) data = self._call(endpoint, params)
if key_data is not None: if key_data is not None:
self.data = data.get(key_data) self.data = data.get(key_data)
if user_data is not None: if key_user is not None and not data[key_user].get("id"):
if not data[user_data].get("id"): user = self.user_detail(self.extractor.user_id, fatal=False)
if user.get("error"):
raise exception.NotFoundError("user") raise exception.NotFoundError("user")
return
while True: while True:
yield from data[key_items] yield from data[key_items]

7
test/results/pixiv.py
View File

@@ -183,6 +183,13 @@ __tests__ = (
"#exception": exception.NotFoundError, "#exception": exception.NotFoundError,
}, },
{
"#url" : "https://www.pixiv.net/users/84930793/artworks",
"#comment" : "empty profile (#8066)",
"#class" : pixiv.PixivArtworksExtractor,
"#count" : 0,
},
{ {
"#url" : "https://www.pixiv.net/en/users/173530/avatar", "#url" : "https://www.pixiv.net/en/users/173530/avatar",
"#class" : pixiv.PixivAvatarExtractor, "#class" : pixiv.PixivAvatarExtractor,