summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/danbooru.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-09-08 19:44:00 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-09-08 19:44:00 -0400
commitc09a9f00dd83017d486cd77650347bc2a397ad55 (patch)
treeb4609415ab7fcb51b1acf74344ed3a414dc0e322 /gallery_dl/extractor/danbooru.py
parent01b2d06c57d52b2c6f241b1beb0e377ee3a8b2a6 (diff)
New upstream version 1.10.4upstream/1.10.4
Diffstat (limited to 'gallery_dl/extractor/danbooru.py')
-rw-r--r--gallery_dl/extractor/danbooru.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index 211c340..e8d3abf 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -28,6 +28,7 @@ class DanbooruExtractor(booru.DanbooruPageMixin, booru.BooruExtractor):
self.scheme = "https" if self.subdomain == "danbooru" else "http"
self.api_url = "{scheme}://{subdomain}.donmai.us/posts.json".format(
scheme=self.scheme, subdomain=self.subdomain)
+ self.ugoira = self.config("ugoira", True)
username, api_key = self._get_auth_info()
if username:
@@ -63,9 +64,15 @@ class DanbooruPoolExtractor(booru.PoolMixin, DanbooruExtractor):
class DanbooruPostExtractor(booru.PostMixin, DanbooruExtractor):
"""Extractor for single images from danbooru"""
pattern = BASE_PATTERN + r"/posts/(?P<post>\d+)"
- test = ("https://danbooru.donmai.us/posts/294929", {
- "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
- })
+ test = (
+ ("https://danbooru.donmai.us/posts/294929", {
+ "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
+ }),
+ ("https://danbooru.donmai.us/posts/3613024", {
+ "pattern": r"https?://.+\.webm$",
+ "options": (("ugoira", False),)
+ })
+ )
class DanbooruPopularExtractor(booru.PopularMixin, DanbooruExtractor):