[flickr] use "download" URLs (#6360)
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user