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

[gelbooru] update video server (fixes #1368)

Browse Source 
from 'https://img2.gelbooru.com' to 'https://img3.gelbooru.com'
and provide fallback URLs
This commit is contained in:
Mike Fährmann 2021-03-10 01:48:07 +01:00
parent f8441e851a
commit 780bac4c8a
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gallery_dl/extractor/gelbooru.py
View File

@ -23,10 +23,16 @@ class GelbooruBase():
url = post["file_url"] url = post["file_url"]
if url.startswith(("https://mp4.gelbooru.com/", "https://video-cdn")): if url.startswith(("https://mp4.gelbooru.com/", "https://video-cdn")):
md5 = post["md5"] md5 = post["md5"]
url = "https://img2.gelbooru.com/images/{}/{}/{}.webm".format( path = "/images/{}/{}/{}.webm".format(md5[0:2], md5[2:4], md5)
md5[0:2], md5[2:4], md5) post["_fallback"] = GelbooruBase._video_fallback(path)
url = "https://img3.gelbooru.com" + path
return url return url
@staticmethod
def _video_fallback(path):
yield "https://img2.gelbooru.com" + path
yield "https://img1.gelbooru.com" + path
class GelbooruTagExtractor(GelbooruBase, class GelbooruTagExtractor(GelbooruBase,
gelbooru_v02.GelbooruV02TagExtractor): gelbooru_v02.GelbooruV02TagExtractor):
@ -80,7 +86,15 @@ class GelbooruPostExtractor(GelbooruBase,
"""Extractor for single images from gelbooru.com""" """Extractor for single images from gelbooru.com"""
pattern = (r"(?:https?://)?(?:www\.)?gelbooru\.com/(?:index\.php)?" pattern = (r"(?:https?://)?(?:www\.)?gelbooru\.com/(?:index\.php)?"
r"\?page=post&s=view&id=(?P<post>\d+)") r"\?page=post&s=view&id=(?P<post>\d+)")
test = ("https://gelbooru.com/index.php?page=post&s=view&id=313638", { test = (
"content": "5e255713cbf0a8e0801dc423563c34d896bb9229", ("https://gelbooru.com/index.php?page=post&s=view&id=313638", {
"count": 1, "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
}) "count": 1,
}),
# video
("https://gelbooru.com/index.php?page=post&s=view&id=5938076", {
"content": "6360452fa8c2f0c1137749e81471238564df832a",
"pattern": r"https://img\d\.gelbooru\.com/images"
r"/22/61/226111273615049235b001b381707bd0\.webm",
}),
)