From 6d583c5b14c391743934c881e7d61a84a7b6045b Mon Sep 17 00:00:00 2001 From: Alexander Wainwright Date: Sun, 13 Apr 2025 15:17:40 +1000 Subject: [PATCH] Fix handling of metadata --- src/stills/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/stills/main.py b/src/stills/main.py index bc4fa26..61da06c 100644 --- a/src/stills/main.py +++ b/src/stills/main.py @@ -37,8 +37,14 @@ def extract_metadata(image_path: Path): meta = img.read_exif() xmp = img.read_xmp() + make = meta.get('Exif.Image.Make', None) camera = meta.get('Exif.Image.Model', None) - film = xmp['Xmp.dc.description']['lang="x-default"'] + if make not in camera: + camera = make + ' ' + camera + try: + film = xmp['Xmp.dc.description']['lang="x-default"'] + except Exception: + film = None return camera, film except Exception: