diff options
Diffstat (limited to 'gallery_dl/extractor/nijie.py')
| -rw-r--r-- | gallery_dl/extractor/nijie.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/gallery_dl/extractor/nijie.py b/gallery_dl/extractor/nijie.py index abf1eaa..4c48d73 100644 --- a/gallery_dl/extractor/nijie.py +++ b/gallery_dl/extractor/nijie.py @@ -106,13 +106,8 @@ class NijieExtractor(AsynchronousMixin, Extractor): params = {"id": self.user_id, "p": 1} while True: - response = self.request(url, params=params, expect=(404,)) - if response.status_code == 404: - raise exception.NotFoundError("artist") - - page = response.text - ids = list(text.extract_iter(page, ' illust_id="', '"')) - yield from ids + page = self.request(url, params=params, notfound="artist").text + yield from text.extract_iter(page, 'illust_id="', '"') if '<a rel="next"' not in page: return @@ -126,7 +121,7 @@ class NijieUserExtractor(NijieExtractor): r"/members(?:_illust)?\.php\?id=(\d+)") test = ( ("https://nijie.info/members_illust.php?id=44", { - "url": "585d821df4716b1098660a0be426d01db4b65f2a", + "url": "66c4ff94c6e77c0765dd88f2d8c663055fda573e", "keyword": "d629c69e3172db1d7e026145e8eb640ac31ac16a", }), ("https://nijie.info/members_illust.php?id=43", { @@ -174,7 +169,7 @@ class NijieImageExtractor(NijieExtractor): r"/view(?:_popup)?\.php\?id=(\d+)") test = ( ("https://nijie.info/view.php?id=70720", { - "url": "a10d4995645b5f260821e32c60a35f73546c2699", + "url": "5497f897311397dafa188521258624346a0af2a3", "keyword": "408393d010307c76d52cbd0a4368d6d357805aea", "content": "d85e3ea896ed5e4da0bca2390ad310a4df716ca6", }), @@ -190,10 +185,8 @@ class NijieImageExtractor(NijieExtractor): self.page = "" def get_job_metadata(self): - response = self.request(self.view_url + self.image_id, expect=(404,)) - if response.status_code == 404: - raise exception.NotFoundError("image") - self.page = response.text + self.page = self.request( + self.view_url + self.image_id, notfound="image").text self.user_id = text.extract( self.page, '"sameAs": "https://nijie.info/members.php?id=', '"')[0] return NijieExtractor.get_job_metadata(self) |