Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2025-02-01 03:51:42 +01:00
Code Issues Releases Wiki Activity

[booru] build directory path for each file (#385)

Browse Source
This commit is contained in:
Mike Fährmann 2019-08-18 23:02:01 +02:00
parent b1728f512d
commit 7a5e78741c
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/extractor/booru.py
View File

@ -41,10 +41,8 @@ class BooruExtractor(SharedConfigMixin, Extractor):
return pages * self.per_page
def items(self):
data = self.get_metadata()
yield Message.Version, 1
yield Message.Directory, data
data = self.get_metadata()
self.reset_page()
while True:
@ -59,9 +57,11 @@ class BooruExtractor(SharedConfigMixin, Extractor):
if url.startswith("/"):
url = text.urljoin(self.api_url, url)
image.update(data)
text.nameext_from_url(url, image)
if self.extags:
self.extended_tags(image)
yield Message.Url, url, text.nameext_from_url(url, image)
yield Message.Directory, image
yield Message.Url, url, image
if len(images) < self.per_page:
return

8
gallery_dl/extractor/gelbooru.py
View File

@ -33,16 +33,16 @@ class GelbooruExtractor(booru.XmlParserMixin,
self.session.cookies["fringeBenefits"] = "yup"
def items_noapi(self):
data = self.get_metadata()
yield Message.Version, 1
yield Message.Directory, data
data = self.get_metadata()
for post in self.get_posts():
post = self.get_post_data(post)
url = post["file_url"]
post.update(data)
yield Message.Url, url, text.nameext_from_url(url, post)
text.nameext_from_url(url, post)
yield Message.Directory, post
yield Message.Url, url, post
def get_posts(self):
"""Return an iterable containing all relevant post objects"""

7
gallery_dl/extractor/sankaku.py
View File

@ -40,17 +40,18 @@ class SankakuExtractor(SharedConfigMixin, Extractor):
def items(self):
self.login()
data = self.get_metadata()
yield Message.Version, 1
yield Message.Directory, data
data = self.get_metadata()
for post_id in util.advance(self.get_posts(), self.start_post):
self.wait()
post = self.get_post_data(post_id)
url = post["file_url"]
post.update(data)
yield Message.Url, url, text.nameext_from_url(url, post)
text.nameext_from_url(url, post)
yield Message.Directory, post
yield Message.Url, url, post
def skip(self, num):
self.start_post += num