Merge pull request #1 from grasdk/feature/kagahd_issue838

kagahd · web-flow · commit f356eae95744 · 2024-03-12T07:06:30.000Z
Added read of CreationDate to sidecar and fixed tests
diff --git a/src/backend/model/fileaccess/MetadataLoader.ts b/src/backend/model/fileaccess/MetadataLoader.ts
diff --git a/src/common/entities/MediaDTO.ts b/src/common/entities/MediaDTO.ts
@@ -40,6 +40,7 @@ export interface SideCarDc {
 
 export interface SideCarXmp {
   Rating?: RatingTypes;
+  CreateDate?: string;
 }
 
 export const MediaDTOUtils = {
diff --git a/test/backend/assets/sidecar/metadata.jpg b/test/backend/assets/sidecar/metadata.jpg
diff --git a/test/backend/assets/sidecar/metadata.jpg.json b/test/backend/assets/sidecar/metadata.jpg.json
@@ -3,8 +3,8 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1710142352337,
-  "fileSize": 4489,
+  "creationDate": 1710188754000,
+  "fileSize": 5095,
   "keywords": [
     "floor",
     "book"
diff --git a/test/backend/assets/sidecar/metadata.jpg_original b/test/backend/assets/sidecar/metadata.jpg_original
diff --git a/test/backend/assets/sidecar/no_metadata.jpg.json b/test/backend/assets/sidecar/no_metadata.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1710142352343,
+  "creationDate": 1542482851000,
   "fileSize": 1430,
   "keywords": [
     "first",
diff --git a/test/backend/assets/sidecar/no_metadata.jpg.xmp b/test/backend/assets/sidecar/no_metadata.jpg.xmp
@@ -1,17 +1,24 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <rdf:Description rdf:about=""
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:fstop="http://www.fstopapp.com/xmp/"
-   fstop:favorite="0">
-   <dc:subject>
-    <rdf:Bag>
-     <rdf:li>first</rdf:li>
-     <rdf:li>second</rdf:li>
-    </rdf:Bag>
-   </dc:subject>
-  </rdf:Description>
- </rdf:RDF>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+        <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:fstop="http://www.fstopapp.com/xmp/"
+            fstop:favorite="0">
+            <dc:subject>
+                <rdf:Bag>
+                    <rdf:li>first</rdf:li>
+                    <rdf:li>second</rdf:li>
+                </rdf:Bag>
+            </dc:subject>
+        </rdf:Description>
+
+        <rdf:Description rdf:about=''
+            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
+            <xmp:CreateDate>2018-11-17T20:27:31+01:00</xmp:CreateDate>
+            <xmp:MetadataDate>2018-11-17T20:27:31+01:00</xmp:MetadataDate>
+            <xmp:ModifyDate>2018-11-17T20:27:31+01:00</xmp:ModifyDate>
+        </rdf:Description>
+    </rdf:RDF>
 </x:xmpmeta>
-<?xpacket end="w"?>
+<?xpacket end="w"?>
diff --git a/test/backend/assets/sidecar/no_metadata_v2.jpg.json b/test/backend/assets/sidecar/no_metadata_v2.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1710142352347,
+  "creationDate": 1542482851000,
   "fileSize": 1430,
   "keywords": [
     "first",
diff --git a/test/backend/assets/sidecar/no_metadata_v2.xmp b/test/backend/assets/sidecar/no_metadata_v2.xmp
@@ -12,6 +12,12 @@
     </rdf:Bag>
    </dc:subject>
   </rdf:Description>
+          <rdf:Description rdf:about=''
+            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
+            <xmp:CreateDate>2018-11-17T20:27:31+01:00</xmp:CreateDate>
+            <xmp:MetadataDate>2018-11-17T20:27:31+01:00</xmp:MetadataDate>
+            <xmp:ModifyDate>2018-11-17T20:27:31+01:00</xmp:ModifyDate>
+        </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
 <?xpacket end="w"?>
diff --git a/test/backend/assets/sidecar/no_metadata_v3.jpg.json b/test/backend/assets/sidecar/no_metadata_v3.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1710142352352,
+  "creationDate": 1542482851000,
   "fileSize": 1430,
   "keywords": [
     "first"
diff --git a/test/backend/assets/sidecar/no_metadata_v3.xmp b/test/backend/assets/sidecar/no_metadata_v3.xmp
@@ -11,6 +11,12 @@
     </rdf:Bag>
    </dc:subject>
   </rdf:Description>
+          <rdf:Description rdf:about=''
+            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
+            <xmp:CreateDate>2018-11-17T20:27:31+01:00</xmp:CreateDate>
+            <xmp:MetadataDate>2018-11-17T20:27:31+01:00</xmp:MetadataDate>
+            <xmp:ModifyDate>2018-11-17T20:27:31+01:00</xmp:ModifyDate>
+        </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
 <?xpacket end="w"?>

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ export interface SideCarDc {`
`40`	`40`
`41`	`41`	`export interface SideCarXmp {`
`42`	`42`	`Rating?: RatingTypes;`
	`43`	`+ CreateDate?: string;`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`export const MediaDTOUtils = {`