[flickr] use "download" URLs (#6360)

This commit is contained in:
Mike Fährmann
2024-11-09 17:33:27 +01:00
parent 1ddbcda58b
commit 0e18fa395d
2 changed files with 14 additions and 6 deletions

View File

@@ -45,7 +45,7 @@ class FlickrExtractor(Extractor):
self.log.debug("", exc_info=exc)
else:
photo.update(data)
url = photo["url"]
url = self._file_url(photo)
yield Message.Directory, photo
yield Message.Url, url, text.nameext_from_url(url, photo)
@@ -57,6 +57,13 @@ class FlickrExtractor(Extractor):
def photos(self):
"""Return an iterable with all relevant photo objects"""
def _file_url(self, photo):
if "video" in photo:
return photo["url"]
path, _, ext = photo["url"].rpartition(".")
return path + "_d." + ext
class FlickrImageExtractor(FlickrExtractor):
"""Extractor for individual images from flickr.com"""
@@ -98,7 +105,7 @@ class FlickrImageExtractor(FlickrExtractor):
if isinstance(value, dict):
location[key] = value["_content"]
url = photo["url"]
url = self._file_url(photo)
yield Message.Directory, photo
yield Message.Url, url, text.nameext_from_url(url, photo)