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

[hentaifoundry] fix infinite loop for multiple of 25 images

Browse Source
This commit is contained in:
Mike Fährmann
2017-07-03 14:16:08 +02:00
parent ce55ec6490
commit dcc1d3b2ea
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/hentaifoundry.py
View File

@@ -18,12 +18,8 @@ class HentaifoundryUserExtractor(Extractor):
subcategory = "user" subcategory = "user"
directory_fmt = ["{category}", "{artist}"] directory_fmt = ["{category}", "{artist}"]
filename_fmt = "{category}_{index}_{title}.{extension}" filename_fmt = "{category}_{index}_{title}.{extension}"
pattern = [ pattern = [r"(?:https?://)?(?:www\.)?hentai-foundry\.com/"
(r"(?:https?://)?(?:www\.)?hentai-foundry\.com/" r"(?:pictures/user/([^/]+)/?$|user/([^/]+)/profile)"]
r"pictures/user/([^/]+)/?$"),
(r"(?:https?://)?(?:www\.)?hentai-foundry\.com/"
r"user/([^/]+)/profile"),
]
test = [ test = [
("https://www.hentai-foundry.com/pictures/user/Tenpura", { ("https://www.hentai-foundry.com/pictures/user/Tenpura", {
"url": "ebbc981a85073745e3ca64a0f2ab31fab967fc28", "url": "ebbc981a85073745e3ca64a0f2ab31fab967fc28",
@@ -37,22 +33,22 @@ class HentaifoundryUserExtractor(Extractor):
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self) Extractor.__init__(self)
self.artist = match.group(1) self.artist = match.group(1) or match.group(2)
def items(self): def items(self):
data, token = self.get_job_metadata() data, token = self.get_job_metadata()
self.set_filters(token) self.set_filters(token)
yield Message.Version, 1 yield Message.Version, 1
yield Message.Directory, data yield Message.Directory, data
for url, image in self.get_images(): for url, image in self.get_images(int(data["count"])):
image.update(data) image.update(data)
yield Message.Url, url, image yield Message.Url, url, image
def get_images(self): def get_images(self, count):
"""Yield url and keywords for all images of one artist""" """Yield url and keywords for all images of one artist"""
num = 1 num = 1
needle = 'thumbTitle"><a href="/pictures/user/' needle = 'thumbTitle"><a href="/pictures/user/'
while True: for _ in range((count-1) // 25 + 1):
pos = 0 pos = 0
url = self.url_base + self.artist + "/page/" + str(num) url = self.url_base + self.artist + "/page/" + str(num)
page = self.request(url).text page = self.request(url).text