1
0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 10:42:34 +01:00

[deviantart] improve handling of private deviations (#414)

- don't try to call '/deviation/metadata' with an empty list of
  deviation ids
- print a warning when detecting private deviations without having
  a 'refresh-token'
This commit is contained in:
Mike Fährmann 2019-09-09 22:39:07 +02:00
parent 4203931d79
commit 6e12907de6
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
3 changed files with 15 additions and 7 deletions

View File

@ -1,5 +1,7 @@
# Changelog
## Unreleased
## 1.10.4 - 2019-09-08
### Additions
- Support for

View File

@ -873,6 +873,8 @@ class DeviantartAPI():
def deviation_metadata(self, deviations):
""" Fetch deviation metadata for a set of deviations"""
if not deviations:
return []
endpoint = "deviation/metadata?" + "&".join(
"deviationids[{}]={}".format(num, deviation["deviationid"])
for num, deviation in enumerate(deviations)
@ -975,13 +977,18 @@ class DeviantartAPI():
if "results" not in data:
self.log.error("Unexpected API response: %s", data)
return
if (public and self.refresh_token and
len(data["results"]) < params["limit"]):
self.log.debug("Switching to private access token")
public = False
continue
if extend:
if public and len(data["results"]) < params["limit"]:
if self.refresh_token:
self.log.debug("Switching to private access token")
public = False
continue
elif data["has_more"]:
self.log.warning(
"Private deviations detected! Run 'gallery-dl "
"oauth:deviantart' and follow the instructions to "
"be able to access them.")
if self.metadata:
self._metadata(data["results"])
if self.folders:
@ -1003,7 +1010,6 @@ class DeviantartAPI():
deviations, self.deviation_metadata(deviations)):
deviation.update(metadata)
deviation["tags"] = [t["tag_name"] for t in deviation["tags"]]
return deviations
def _folders(self, deviations):
"""Add a list of all containing folders to each deviation object"""

View File

@ -6,4 +6,4 @@
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
__version__ = "1.10.4"
__version__ = "1.10.5-dev"