don't completely fail when not allowed to get EXIF data

beaufour · Feb 28, 2023 · c647753 · c647753
1 parent 9a7d3b9
commit c647753
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/flickr_download/flick_download.py b/flickr_download/flick_download.py
@@ -13,7 +13,7 @@
 
 import flickr_api as Flickr
 import yaml
-from flickr_api.flickrerrors import FlickrError
+from flickr_api.flickrerrors import FlickrAPIError, FlickrError
 from flickr_api.objects import Person, Photo, Photoset, Walker
 
 from flickr_download.filename_handlers import (
@@ -242,12 +242,18 @@ def do_download_photo(
                 with open(json_fname, "w", encoding="utf-8") as json_file:
                     logging.info("Saving photo info: %s", json_fname)
                     photo_data = photo.__dict__.copy()
-                    photo_data["exif"] = photo.getExif()
+                    try:
+                        photo_data["exif"] = photo.getExif()
+                    except FlickrAPIError as ex:
+                        if ex.code == 2:
+                            logging.warning("Could not get EXIF data. Likely not photo owner?")
+                        else:
+                            raise
                     json_file.write(
                         json.dumps(photo_data, default=serialize_json, indent=2, sort_keys=True)
                     )
         except Exception:
-            logging.warning("Trouble saving photo info: %s", sys.exc_info()[0])
+            logging.warning("Trouble saving photo info: %s", sys.exc_info())
 
     if not size_label and photo._getLargestSizeLabel() == "Video Player":
         # For old videos there doesn't seem to be an actual video url