diff --git a/README.rst b/README.rst index 9d017abb..366db3cb 100644 --- a/README.rst +++ b/README.rst @@ -7,8 +7,8 @@ to download image galleries and collections from several image hosting sites (see `Supported Sites `__). It is a cross-platform tool -with many `configuration options `__ -and powerful `filenaming capabilities `__. +with many `configuration options `__ +and powerful `filenaming capabilities `__. |pypi| |build| @@ -234,7 +234,7 @@ Documentation ------------- A list of all available configuration options and their descriptions -can be found in ``__. +can be found at ``__. | For a default configuration file with available options set to their default values, see ``__. @@ -330,7 +330,7 @@ CAPTCHA or similar, or has not been implemented yet, you can use the cookies from a browser login session and input them into *gallery-dl*. This can be done via the -`cookies `__ +`cookies `__ option in your configuration file by specifying - | the path to a Mozilla/Netscape format cookies.txt file exported by a browser addon diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 8805aebe..dc24a29e 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -947,7 +947,7 @@ Consider all listed sites to potentially be NSFW. Wallhaven https://wallhaven.cc/ Collections, individual Images, Search Results, User Profiles - API Key + API Key Wallpaper Cave @@ -965,7 +965,7 @@ Consider all listed sites to potentially be NSFW. Weasyl https://www.weasyl.com/ Favorites, Folders, Journals, Submissions - API Key + API Key webmshare @@ -1319,7 +1319,7 @@ Consider all listed sites to potentially be NSFW. Derpibooru https://derpibooru.org/ Galleries, Posts, Search Results - API Key + API Key Ponybooru diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index ca8acaa5..993885ab 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -1457,9 +1457,8 @@ class DeviantartOAuthAPI(): self.log.info( "Register your own OAuth application and use its " "credentials to prevent this error: " - "https://github.com/mikf/gallery-dl/blob/master/do" - "cs/configuration.rst#extractordeviantartclient-id" - "--client-secret") + "https://gdl-org.github.io/docs/configuration.html" + "#extractor-deviantart-client-id-client-secret") else: if log: self.log.error(msg) diff --git a/gallery_dl/extractor/reddit.py b/gallery_dl/extractor/reddit.py index a3a455a9..ce602f6c 100644 --- a/gallery_dl/extractor/reddit.py +++ b/gallery_dl/extractor/reddit.py @@ -487,14 +487,14 @@ class RedditAPI(): remaining = response.headers.get("x-ratelimit-remaining") if remaining and float(remaining) < 2: - if self._warn_429: - self._warn_429 = False + self.log.warning("API rate limit exceeded") + if self._warn_429 and self.client_id == self.CLIENT_ID: self.log.info( "Register your own OAuth application and use its " "credentials to prevent this error: " - "https://github.com/mikf/gallery-dl/blob/master" - "/docs/configuration.rst" - "#extractorredditclient-id--user-agent") + "https://gdl-org.github.io/docs/configuration.html" + "#extractor-reddit-client-id-user-agent") + self._warn_429 = False self.extractor.wait( seconds=response.headers["x-ratelimit-reset"]) continue diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index fee0145d..c34910f8 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -447,9 +447,9 @@ class TumblrAPI(oauth.OAuth1API): if api_key == self.API_KEY: self.log.info( "Register your own OAuth application and use its " - "credentials to prevent this error: https://githu" - "b.com/mikf/gallery-dl/blob/master/docs/configurat" - "ion.rst#extractortumblrapi-key--api-secret") + "credentials to prevent this error: " + "https://gdl-org.github.io/docs/configuration.html" + "#extractor-tumblr-api-key-api-secret") if self.extractor.config("ratelimit") == "wait": self.extractor.wait(seconds=reset) diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index 04b421c4..f3535f1d 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -342,12 +342,12 @@ URL_MAP = { _OAUTH = 'OAuth' _COOKIES = 'Cookies' -_APIKEY_DB = \ - 'API Key' -_APIKEY_WH = \ - 'API Key' -_APIKEY_WY = \ - 'API Key' +_APIKEY_DB = ('API Key') +_APIKEY_WH = ('API Key') +_APIKEY_WY = ('API Key') AUTH_MAP = { "aibooru" : "Supported",