Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2025-01-31 19:51:34 +01:00
Code Issues Releases Wiki Activity

[flickr] skip unavailable images/videos (fixes #398)

Browse Source
This commit is contained in:
Mike Fährmann 2019-08-27 23:26:49 +02:00
parent c9b97dbca3
commit 20fd2d8450
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/flickr.py
View File

@ -25,12 +25,20 @@ class FlickrExtractor(Extractor):
def items(self):
data = self.metadata()
extract = self.api._extract_format
yield Message.Version, 1
yield Message.Directory, data
for photo in self.photos():
photo.update(data)
url = photo["url"]
yield Message.Url, url, text.nameext_from_url(url, photo)
try:
photo = extract(photo)
except Exception as exc:
self.log.warning(
"Skipping %s (%s)", photo["id"], exc.__class__.__name__)
self.log.debug("", exc_info=True)
else:
photo.update(data)
url = photo["url"]
yield Message.Url, url, text.nameext_from_url(url, photo)
def metadata(self):
"""Return general metadata"""
@ -432,7 +440,7 @@ class FlickrAPI(oauth.OAuth1API):
while True:
data = self._call(method, params)[key]
yield from map(self._extract_format, data["photo"])
yield from data["photo"]
if params["page"] >= data["pages"]:
return
params["page"] += 1