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

[flickr] improve error handling (#109)

Browse Source
This commit is contained in:
Mike Fährmann
2018-09-17 10:10:32 +02:00
parent 2be4c9ffe3
commit 26cbcb3a72
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/extractor/flickr.py
View File

@@ -368,8 +368,15 @@ class FlickrAPI(oauth.OAuth1API):
if self.api_key:
params["api_key"] = self.api_key
data = self.session.get(self.API_URL, params=params).json()
if "code" in data and data["code"] == 1:
raise exception.NotFoundError(self.subcategory)
if "code" in data:
if data["code"] == 1:
raise exception.NotFoundError(self.subcategory)
elif data["code"] == 98:
raise exception.AuthenticationError(data.get("message"))
elif data["code"] == 99:
raise exception.AuthorizationError()
self.log.error("API call failed: %s", data.get("message"))
raise exception.StopExtraction()
return data
def _pagination(self, method, params):