self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2025-01-08 04:03:48 +02:00
Code Issues Releases Activity

Merge pull request #1 from grasdk/feature/kagahd_issue838

Browse Source 
Added read of CreationDate to sidecar and fixed tests
This commit is contained in:
Kay Agahd 2024-03-12 07:06:30 +00:00 committed by GitHub
commit f356eae957
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 705 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/model/fileaccess/MetadataLoader.ts
View File

@ -640,6 +640,9 @@ export class MetadataLoader {
if ((sidecarData as SideCar).xmp.Rating !== undefined) {
metadata.rating = (sidecarData as SideCar).xmp.Rating;
}
if ((sidecarData as SideCar).xmp.CreateDate) {
metadata.creationDate = timestampToMS((sidecarData as SideCar).xmp.CreateDate, null);
}
}
}
}

1
src/common/entities/MediaDTO.ts
View File

@ -40,6 +40,7 @@ export interface SideCarDc {
export interface SideCarXmp {
Rating?: RatingTypes;
CreateDate?: string;
}
export const MediaDTOUtils = {

BIN
test/backend/assets/sidecar/metadata.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

4
test/backend/assets/sidecar/metadata.jpg.json
View File

@ -3,8 +3,8 @@
"width": 10,
"height": 5
},
"creationDate": 1710142352337,
"fileSize": 4489,
"creationDate": 1710188754000,
"fileSize": 5095,
"keywords": [
"floor",
"book"

BIN
test/backend/assets/sidecar/metadata.jpg_original Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

2
test/backend/assets/sidecar/no_metadata.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10,
"height": 5
},
"creationDate": 1710142352343,
"creationDate": 1542482851000,
"fileSize": 1430,
"keywords": [
"first",

7
test/backend/assets/sidecar/no_metadata.jpg.xmp
View File

@ -12,6 +12,13 @@
</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"?>

2
test/backend/assets/sidecar/no_metadata_v2.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10,
"height": 5
},
"creationDate": 1710142352347,
"creationDate": 1542482851000,
"fileSize": 1430,
"keywords": [
"first",

6
test/backend/assets/sidecar/no_metadata_v2.xmp
View File

@ -11,6 +11,12 @@
<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>

2
test/backend/assets/sidecar/no_metadata_v3.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10,
"height": 5
},
"creationDate": 1710142352352,
"creationDate": 1542482851000,
"fileSize": 1430,
"keywords": [
"first"

6
test/backend/assets/sidecar/no_metadata_v3.xmp
View File

@ -10,6 +10,12 @@
<rdf:li>first</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>