luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Metadata: Stack media files with the same "ContentIdentifier" #3960

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-12-19 16:55:08 +01:00
parent b725f08e3e
commit cc179e9ecf
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/meta/data.go
View file

@ -17,7 +17,7 @@ const (
type Data struct {
FileName string `meta:"FileName"`
MimeType string `meta:"MIMEType" report:"-"`
DocumentID string `meta:"BurstUUID,MediaGroupUUID,ImageUniqueID,OriginalDocumentID,DocumentID,DigitalImageGUID"`
DocumentID string `meta:"ContentIdentifier,MediaGroupUUID,BurstUUID,OriginalDocumentID,DocumentID,ImageUniqueID,DigitalImageGUID"` // see https://exiftool.org/forum/index.php?topic=14874.0
InstanceID string `meta:"InstanceID,DocumentID"`
CreatedAt time.Time `meta:"SubSecCreateDate,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,TrackCreateDate"`
TakenAt time.Time `meta:"SubSecDateTimeOriginal,SubSecDateTimeCreated,DateTimeOriginal,CreationDate,DateTimeCreated,DateTime,DateTimeDigitized" xmp:"DateCreated"`

2
internal/meta/json_test.go
View file

@ -765,6 +765,7 @@ func TestJSON(t *testing.T) {
assert.Equal(t, "Apple", data.CameraMake)
assert.Equal(t, "iPhone X", data.CameraModel)
assert.Equal(t, "", data.LensModel)
assert.Equal(t, "ca20385d-6106-49c9-acf5-2f8098f4b390", data.DocumentID)
})
t.Run("aurora.jpg.json", func(t *testing.T) {
@ -1294,6 +1295,7 @@ func TestJSON(t *testing.T) {
assert.Equal(t, "Apple", data.CameraMake)
assert.Equal(t, "iPhone 14 Pro Max", data.CameraModel)
assert.Equal(t, "iPhone 14 Pro Max back triple camera 9mm f/2.8", data.LensModel)
assert.Equal(t, "e5f10d35-06c3-4f75-a00c-50b793a6c325", data.DocumentID)
})
t.Run("buggy_panorama.json", func(t *testing.T) {