diff --git a/docs/configuration.rst b/docs/configuration.rst index 13c8999b18..6b9a75a6b8 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -148,12 +148,15 @@ Description The username and password to use when attempting to log in to Specifying username and password is required for the ``pixiv``, ``nijie`` and ``seiga`` modules and - optional (but strongly recommended) for ``exhentai``, + optional (but strongly recommended) for ``danbooru``, ``exhentai``, ``sankaku`` and ``idolcomplex``. These values can also be set via the ``-u/--username`` and ``-p/--password`` command-line options or by using a |.netrc|_ file. (see Authentication_) + + Note: The password for ``danbooru`` is the API key found in your + user profile, not the password for your account. =========== ===== diff --git a/docs/gallery-dl.conf b/docs/gallery-dl.conf index 02f25a64a2..2bd4141a3d 100644 --- a/docs/gallery-dl.conf +++ b/docs/gallery-dl.conf @@ -14,6 +14,11 @@ { "external": false }, + "danbooru": + { + "username": null, + "password": null + }, "deviantart": { "refresh-token": null, @@ -72,6 +77,11 @@ "password": null, "ugoira": true }, + "reactor": + { + "wait-min": 3.0, + "wait-max": 6.0 + }, "recursive": { "blacklist": ["directlink", "oauth", "recursive", "test"] diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py index 83cc9d84f9..ca637ecc65 100644 --- a/gallery_dl/extractor/danbooru.py +++ b/gallery_dl/extractor/danbooru.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2014-2018 Mike Fährmann +# Copyright 2014-2019 Mike Fährmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -29,6 +29,11 @@ def __init__(self, match): self.api_url = "{scheme}://{subdomain}.donmai.us/posts.json".format( scheme=self.scheme, subdomain=self.subdomain) + username, api_key = self._get_auth_info() + if username: + self.log.debug("Using HTTP Basic Auth for user '%s'", username) + self.session.auth = (username, api_key) + class DanbooruTagExtractor(booru.TagMixin, DanbooruExtractor): """Extractor for images from danbooru based on search-tags"""