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

[tumblr] improve error handling (#297)

Browse Source 
In some cases Tumblr's API responds with an HTML document.
Trying to decode it as JSON would raise an uncaught exception.
This commit is contained in:
Mike Fährmann 2019-06-04 13:49:57 +02:00
parent c08c340178
commit 208202b962
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gallery_dl/extractor/tumblr.py
View File

@ -268,7 +268,10 @@ class TumblrPostExtractor(TumblrExtractor):
"count": 0,
}),
("http://pinetre-3.tumblr.com/post/181904381470/via", {
"count": 0, # audio post with "null" as URL
"count": 0, # audio post with "null" as URL (#165)
}),
("http://ziemniax.tumblr.com/post/109697912859/", {
"exception": exception.NotFoundError, # HTML response (#297)
}),
("http://demo.tumblr.com/image/459265350"),
)
@ -372,12 +375,18 @@ class TumblrAPI(oauth.OAuth1API):
blog, endpoint)
response = self.request(url, params=params, **kwargs)
data = response.json()
status = data["meta"]["status"]
if 200 <= status < 400:
return data["response"]
elif status == 403:
try:
data = response.json()
except ValueError:
data = response.text
status = response.status_code
else:
status = data["meta"]["status"]
if 200 <= status < 400:
return data["response"]
if status == 403:
raise exception.AuthorizationError()
elif status == 404:
raise exception.NotFoundError("user or post")