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

[nijie] raise NotFoundError

Browse Source
This commit is contained in:
Mike Fährmann
2016-09-04 11:01:16 +02:00
parent 8f6d055deb
commit dcd213f13e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gallery_dl/extractor/nijie.py
View File

@@ -39,9 +39,10 @@ class NijieUserExtractor(AsynchronousExtractor):
config.interpolate(("extractor", self.category, "password")) config.interpolate(("extractor", self.category, "password"))
) )
data = self.get_job_metadata() data = self.get_job_metadata()
images = self.get_image_ids()
yield Message.Version, 1 yield Message.Version, 1
yield Message.Directory, data yield Message.Directory, data
for image_id in self.get_image_ids(): for image_id in images:
for image_url, image_data in self.get_image_data(image_id): for image_url, image_data in self.get_image_data(image_id):
image_data.update(data) image_data.update(data)
yield Message.Url, image_url, image_data yield Message.Url, image_url, image_data
@@ -55,8 +56,10 @@ class NijieUserExtractor(AsynchronousExtractor):
def get_image_ids(self): def get_image_ids(self):
"""Collect all image-ids for a specific artist""" """Collect all image-ids for a specific artist"""
page = self.request(self.artist_url).text response = self.session.get(self.artist_url)
return list(text.extract_iter(page, ' illust_id="', '"')) if response.status_code == 404:
raise exception.NotFoundError("artist")
return list(text.extract_iter(response.text, ' illust_id="', '"'))
def get_image_data(self, image_id): def get_image_data(self, image_id):
"""Get URL and metadata for images specified by 'image_id'""" """Get URL and metadata for images specified by 'image_id'"""