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

[flickr] handle non-JSON errors (#5131)

Browse Source
This commit is contained in:
Mike Fährmann
2024-02-06 21:22:10 +01:00
parent 90ac6d7375
commit 6e928300bc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gallery_dl/extractor/flickr.py
View File

@@ -386,7 +386,11 @@ class FlickrAPI(oauth.OAuth1API):
params["nojsoncallback"] = "1" params["nojsoncallback"] = "1"
if self.api_key: if self.api_key:
params["api_key"] = self.api_key params["api_key"] = self.api_key
data = self.request(self.API_URL, params=params).json() response = self.request(self.API_URL, params=params)
try:
data = response.json()
except ValueError:
data = {"code": -1, "message": response.content}
if "code" in data: if "code" in data:
msg = data.get("message") msg = data.get("message")
self.log.debug("Server response: %s", data) self.log.debug("Server response: %s", data)