Title and caption update - reapplied

src/backend/model/fileaccess/MetadataLoader.ts

@@ -316,6 +316,8 @@ export class MetadataLoader {
     const orientation = MetadataLoader.getOrientation(exif);
     MetadataLoader.mapImageDimensions(metadata, exif, orientation);
     MetadataLoader.mapKeywords(metadata, exif);
+    MetadataLoader.mapTitle(metadata, exif);
+    MetadataLoader.mapCaption(metadata, exif);
     MetadataLoader.mapTimestampAndOffset(metadata, exif);
     MetadataLoader.mapCameraData(metadata, exif);
     MetadataLoader.mapGPS(metadata, exif);
@@ -370,6 +372,14 @@ export class MetadataLoader {
     }
   }
 
+  private static mapTitle(metadata: PhotoMetadata, exif: any) {
+    metadata.title = exif.dc?.title?.value || metadata.title || exif.photoshop?.Headline || exif.acdsee?.caption; //acdsee caption holds the title when data is saved by digikam. Used as last resort if iptc and dc do not contain the data
+  }
+
+  private static mapCaption(metadata: PhotoMetadata, exif: any) {
+    metadata.caption = exif.dc?.description?.value || metadata.caption || exif.ifd0?.ImageDescription || exif.exif?.UserComment?.value || exif.Iptc4xmpCore?.ExtDescrAccessibility?.value ||exif.acdsee?.notes;
+  }
+
   private static mapTimestampAndOffset(metadata: PhotoMetadata, exif: any) {
     metadata.creationDate = Utils.timestampToMS(exif?.photoshop?.DateCreated, null) ||
     Utils.timestampToMS(exif?.xmp?.CreateDate, null) ||
@@ -418,18 +428,13 @@ export class MetadataLoader {
 
   private static mapCameraData(metadata: PhotoMetadata, exif: any) {
     metadata.cameraData = metadata.cameraData || {};
-    if (exif.ifd0) {
-      if (exif.ifd0.Make && exif.ifd0.Make !== '') {
-        metadata.cameraData.make = '' + exif.ifd0.Make;
-      }
-      if (exif.ifd0.Model && exif.ifd0.Model !== '') {
-        metadata.cameraData.model = '' + exif.ifd0.Model;
-      }
-    }
+    metadata.cameraData.make = exif.ifd0?.Make || exif.tiff?.Make || metadata.cameraData.make;
+
+    metadata.cameraData.model = exif.ifd0?.Model || exif.tiff?.Model || metadata.cameraData.model;
+
+    metadata.cameraData.lens = exif.exif?.LensModel || exif.exifEX?.LensModel || metadata.cameraData.lens;
+
     if (exif.exif) {
-      if (exif.exif.LensModel && exif.exif.LensModel !== '') {
-        metadata.cameraData.lens = '' + exif.exif.LensModel;
-      }
       if (Utils.isUInt32(exif.exif.ISO)) {
         metadata.cameraData.ISO = parseInt('' + exif.exif.ISO, 10);
       }
@@ -449,6 +454,7 @@ export class MetadataLoader {
         );
       }
     }
+    Utils.removeNullOrEmptyObj(metadata.cameraData);
     if (Object.keys(metadata.cameraData).length === 0) {
       delete metadata.cameraData;
     }
@@ -473,13 +479,8 @@ export class MetadataLoader {
     } catch (err) {
       Logger.error(LOG_TAG, 'Error during reading of GPS data: ' + err);
     } finally {
-      if (metadata.positionData?.GPSData &&
-          (Object.keys(metadata.positionData.GPSData).length === 0 ||
-          metadata.positionData.GPSData.longitude === undefined ||
-          metadata.positionData.GPSData.latitude === undefined)) {
-          delete metadata.positionData.GPSData;
-      }
       if (metadata.positionData) {
+        Utils.removeNullOrEmptyObj(metadata.positionData);
         if (Object.keys(metadata.positionData).length === 0) {
           delete metadata.positionData;
         }

src/common/Utils.ts

@@ -35,7 +35,7 @@ export class Utils {
             delete obj[key];
           }
         }
-      } else if (obj[key] === null) {
+      } else if (obj[key] === null || obj[key] === undefined) {
         delete obj[key];
       }
     }
@@ -132,7 +132,7 @@ export class Utils {
     //replace : with - in the yyyy-mm-dd part of the timestamp.
     let formattedTimestamp = timestamp.substring(0,9).replaceAll(':', '-') + timestamp.substring(9,timestamp.length);
     if (formattedTimestamp.indexOf("Z") > 0) { //replace Z (and what comes after the Z) with offset
-      formattedTimestamp.substring(0, formattedTimestamp.indexOf("Z")) + (offset ? offset : '+00:00');
+      formattedTimestamp = formattedTimestamp.substring(0, formattedTimestamp.indexOf("Z")) + (offset ? offset : '+00:00');
     } else if (formattedTimestamp.indexOf("+") > 0 || timestamp.substring(9,timestamp.length).indexOf("-") > 0) { //don't do anything
     } else { //add offset
       formattedTimestamp = formattedTimestamp + (offset ? offset : '+00:00');

test/backend/assets/sidecar/flatxmp.json

@@ -0,0 +1,38 @@
+{
+  "size": {
+    "width": 10,
+    "height": 5
+  },
+  "caption": "Description of image",
+  "creationDate": 328817998000,
+  "creationDateOffset": "-06:00",
+  "faces": [
+    {
+      "box": {
+        "height": 1,
+        "left": 6,
+        "top": 2,
+        "width": 2
+      },
+      "name": "Person1"
+    },
+    {
+      "box": {
+        "height": 2,
+        "left": 2,
+        "top": 1,
+        "width": 2
+      },
+      "name": "Person2"
+    }
+  ],
+  "fileSize": 1430,
+  "keywords": [
+    "Thing3"
+  ],
+  "title": "The title",
+  "cameraData": {
+    "make": "Cam Make",
+    "model": "Cam Model"
+  }
+}