xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

resolve merge conflicts due to PR #829

Browse Source
This commit is contained in:
kagahd 2024-03-04 12:21:39 +01:00
parent 0f0a66c05d
commit fb65910993
No known key found for this signature in database
GPG Key ID: C7C8777FDE0053DF
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709057753000, "creationDate": 1709549328178,
"fileSize": 4489, "fileSize": 4489,
"keywords": [ "keywords": [
"floor", "floor",

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

@ -3,10 +3,10 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709057753000, "creationDate": 1709549328185,
"fileSize": 1430, "fileSize": 1430,
"keywords": [ "keywords": [
"first", "first",
"second" "second"
] ]
} }

12
test/backend/assets/sidecar/no_metadata_v2.jpg.json Normal file
View File

@ -0,0 +1,12 @@
{
"size": {
"width": 10,
"height": 5
},
"creationDate": 1709549328188,
"fileSize": 1430,
"keywords": [
"first",
"second"
]
}

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

@ -3,9 +3,9 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709057753000, "creationDate": 1709549328189,
"fileSize": 1430, "fileSize": 1430,
"keywords": [ "keywords": [
"first" "first"
] ]
} }

2
test/backend/unit/model/threading/MetaDataLoader.spec.ts
View File

@ -131,7 +131,7 @@ describe('MetadataLoader', () => {
it('should load sidecar file without file extension for photo', async () => { it('should load sidecar file without file extension for photo', async () => {
const data = await MetadataLoader.loadPhotoMetadata(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg')); const data = await MetadataLoader.loadPhotoMetadata(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg'));
const expected = require(path.join(__dirname, '/../../../assets/sidecar/no_metadata.jpg.json'));//sidecar "no_metadata_v2.xmp" is identical to "no_metadata.jpg.xmp" so we expect the same result const expected = require(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg.json'));
expect(Utils.clone(data)).to.be.deep.equal(expected); expect(Utils.clone(data)).to.be.deep.equal(expected);
}); });