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

[flickr] add 'info' option (#4720 #6817)

Browse Source
This commit is contained in:
Mike Fährmann
2025-05-12 16:44:44 +02:00
parent bd7fcdab4c
commit 6b84de6cf7
4 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gallery_dl/extractor/flickr.py
View File

@@ -81,7 +81,7 @@ class FlickrImageExtractor(FlickrExtractor):
photo = self.api.photos_getInfo(item_id)
self.api._extract_metadata(photo)
self.api._extract_metadata(photo, False)
if photo["media"] == "video" and self.api.videos:
self.api._extract_video(photo)
else:
@@ -279,9 +279,10 @@ class FlickrAPI(oauth.OAuth1API):
def __init__(self, extractor):
oauth.OAuth1API.__init__(self, extractor)
self.exif = extractor.config("exif", False)
self.videos = extractor.config("videos", True)
self.contexts = extractor.config("contexts", False)
self.meta_exif = extractor.config("exif", False)
self.meta_info = extractor.config("info", False)
self.meta_contexts = extractor.config("contexts", False)
self.maxsize = extractor.config("size-max")
if isinstance(self.maxsize, str):
@@ -522,8 +523,24 @@ class FlickrAPI(oauth.OAuth1API):
photo["width"] = photo["height"] = 0
return photo
def _extract_metadata(self, photo):
if self.exif:
def _extract_metadata(self, photo, info=True):
if info and self.meta_info:
try:
photo.update(self.photos_getInfo(photo["id"]))
photo["user"] = photo["owner"]
photo["title"] = photo["title"]["_content"]
photo["comments"] = text.parse_int(
photo["comments"]["_content"])
photo["description"] = photo["description"]["_content"]
photo["tags"] = [t["raw"] for t in photo["tags"]["tag"]]
photo["views"] = text.parse_int(photo["views"])
photo["id"] = text.parse_int(photo["id"])
except Exception as exc:
self.log.warning(
"Unable to retrieve 'info' data for %s (%s: %s)",
photo["id"], exc.__class__.__name__, exc)
if self.meta_exif:
try:
photo.update(self.photos_getExif(photo["id"]))
except Exception as exc:
@@ -531,7 +548,7 @@ class FlickrAPI(oauth.OAuth1API):
"Unable to retrieve 'exif' data for %s (%s: %s)",
photo["id"], exc.__class__.__name__, exc)
if self.contexts:
if self.meta_contexts:
try:
photo.update(self.photos_getAllContexts(photo["id"]))
except Exception as exc: