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

[gelbooru] fix tag category extraction (#1455)

Browse Source
This commit is contained in:
thatfuckingbird
2021-04-10 19:05:00 +02:00
committed by GitHub
parent fe6ce5b8f8
commit 918b0441fb
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/extractor/gelbooru.py
View File

@@ -91,6 +91,17 @@ class GelbooruPostExtractor(GelbooruBase,
"content": "5e255713cbf0a8e0801dc423563c34d896bb9229", "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
"count": 1, "count": 1,
}), }),
("https://gelbooru.com/index.php?page=post&s=view&id=6018318", {
"options": (("tags", True),),
"content": "977caf22f27c72a5d07ea4d4d9719acdab810991",
"keyword": {
"tags_artist": "kirisaki_shuusei",
"tags_character": str,
"tags_copyright": "vocaloid",
"tags_general": str,
"tags_metadata": str,
},
}),
# video # video
("https://gelbooru.com/index.php?page=post&s=view&id=5938076", { ("https://gelbooru.com/index.php?page=post&s=view&id=5938076", {
"content": "6360452fa8c2f0c1137749e81471238564df832a", "content": "6360452fa8c2f0c1137749e81471238564df832a",

2
gallery_dl/extractor/gelbooru_v02.py
View File

@@ -47,6 +47,8 @@ class GelbooruV02Extractor(booru.BooruExtractor):
self.root, post["id"]) self.root, post["id"])
page = self.request(url).text page = self.request(url).text
html = text.extract(page, '<ul id="tag-', '</ul>')[0] html = text.extract(page, '<ul id="tag-', '</ul>')[0]
if not html:
html = text.extract(page, '<ul class="tag-', '</ul>')[0]
if html: if html:
tags = collections.defaultdict(list) tags = collections.defaultdict(list)
pattern = re.compile( pattern = re.compile(