From 5b676ea59dfc4d6d70732e656b15d1b41c1ce562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 14 Mar 2020 01:13:14 +0100 Subject: [PATCH] [e621] document username & password support (#640) --- README.rst | 4 ++-- docs/configuration.rst | 27 ++++++++++++++++++++------- docs/supportedsites.rst | 2 +- scripts/supportedsites.py | 1 + 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 04b08a8e..c9e95486 100644 --- a/README.rst +++ b/README.rst @@ -182,8 +182,8 @@ Username & Password Some extractors require you to provide valid login-credentials in the form of a username & password pair. This is necessary for ``pixiv``, ``nijie``, and ``seiga`` -and optional (but strongly recommended) for -``danbooru``, ``exhentai``, ``idolcomplex``, ``instagram``, +and optional for +``danbooru``, ``e621``, ``exhentai``, ``idolcomplex``, ``instagram``, ``luscious``, ``sankaku``, ``tsumino``, and ``twitter``. You can set the necessary information in your configuration file diff --git a/docs/configuration.rst b/docs/configuration.rst index d495a64d..00bf7978 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -196,18 +196,31 @@ Default ``null`` Description The username and password to use when attempting to log in to another site. - Specifying username and password is required for the - ``pixiv``, ``nijie``, and ``seiga`` - modules and optional (but strongly recommended) for - ``danbooru``, ``exhentai``, ``idolcomplex``, ``instagram``, - ``luscious``, ``sankaku``, ``tsumino``, and ``twitter``. + Specifying a username and password is required for + + * ``pixiv`` + * ``nijie`` + * ``seiga`` + + and optional for + + * ``danbooru`` + * ``e621`` + * ``exhentai`` + * ``idolcomplex`` + * ``instagram`` + * ``luscious`` + * ``sankaku`` + * ``tsumino`` + * ``twitter`` 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. + Note: The password values for ``danbooru`` and ``e621`` should be + the API keys found in your user profile, not your actual account + password. =========== ===== diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 68c61c76..a4004798 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -27,7 +27,7 @@ DeviantArt https://www.deviantart.com/ |deviantart-C| Doki Reader https://kobato.hologfx.com/reader/ Chapters, Manga Dynasty Reader https://dynasty-scans.com/ Chapters, individual Images, Search Results E-Hentai https://e-hentai.org/ Favorites, Galleries, Search Results Optional -e621 https://e621.net/ Pools, Popular Images, Posts, Tag-Searches +e621 https://e621.net/ Pools, Popular Images, Posts, Tag-Searches Optional ExHentai https://exhentai.org/ Favorites, Galleries, Search Results Optional Fallen Angels Scans https://www.fascans.com/ Chapters, Manga Fashion Nova https://www.fashionnova.com/ Collections, Products diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index 947b670f..cf054503 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -135,6 +135,7 @@ SUBCATEGORY_MAP = { AUTH_MAP = { "danbooru" : "Optional", "deviantart" : "Optional (OAuth)", + "e621" : "Optional", "e-hentai" : "Optional", "exhentai" : "Optional", "flickr" : "Optional (OAuth)",