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

fix rate limit handling for OAuth APIs (#368)

Browse Source
This commit is contained in:
Mike Fährmann
2019-08-03 13:43:00 +02:00
parent f687052daf
commit f4bc75e854
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gallery_dl/extractor/common.py
View File

@@ -87,7 +87,8 @@ class Extractor():
raise exception.HttpError(exc) raise exception.HttpError(exc)
else: else:
code = response.status_code code = response.status_code
if 200 <= code < 400 or not fatal and \ if 200 <= code < 400 or fatal is None and \
(400 <= code < 500) or not fatal and \
(400 <= code < 429 or 431 <= code < 500): (400 <= code < 429 or 431 <= code < 500):
if encoding: if encoding:
response.encoding = encoding response.encoding = encoding

2
gallery_dl/extractor/deviantart.py
View File

@@ -817,7 +817,7 @@ class DeviantartAPI():
self.authenticate(None if public else self.refresh_token) self.authenticate(None if public else self.refresh_token)
response = self.extractor.request( response = self.extractor.request(
url, headers=self.headers, params=params, fatal=False) url, headers=self.headers, params=params, fatal=None)
data = response.json() data = response.json()
status = response.status_code status = response.status_code

2
gallery_dl/extractor/reddit.py
View File

@@ -234,7 +234,7 @@ class RedditAPI():
url = "https://oauth.reddit.com" + endpoint url = "https://oauth.reddit.com" + endpoint
params["raw_json"] = 1 params["raw_json"] = 1
self.authenticate() self.authenticate()
response = self.extractor.request(url, params=params, fatal=False) response = self.extractor.request(url, params=params, fatal=None)
remaining = response.headers.get("x-ratelimit-remaining") remaining = response.headers.get("x-ratelimit-remaining")
if remaining and float(remaining) < 2: if remaining and float(remaining) < 2:
wait = int(response.headers["x-ratelimit-reset"]) wait = int(response.headers["x-ratelimit-reset"])

2
gallery_dl/oauth.py
View File

@@ -127,6 +127,6 @@ class OAuth1API():
self.api_key = api_key self.api_key = api_key
def request(self, url, method="GET", **kwargs): def request(self, url, method="GET", **kwargs):
kwargs["fatal"] = False kwargs["fatal"] = None
kwargs["session"] = self.session kwargs["session"] = self.session
return self.extractor.request(url, method, **kwargs) return self.extractor.request(url, method, **kwargs)