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

Metadata: Prefer SubSecDateTimeOriginal and SubSecCreateDate #2320

Browse source
This commit is contained in:
Michael Mayer 2022-05-17 02:03:50 +02:00
parent 400c25ad43
commit 53d814e62e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/meta/data.go
View file

@ -17,8 +17,8 @@ type Data struct {
FileName string `meta:"FileName"` FileName string `meta:"FileName"`
DocumentID string `meta:"BurstUUID,MediaGroupUUID,ImageUniqueID,OriginalDocumentID,DocumentID"` DocumentID string `meta:"BurstUUID,MediaGroupUUID,ImageUniqueID,OriginalDocumentID,DocumentID"`
InstanceID string `meta:"InstanceID,DocumentID"` InstanceID string `meta:"InstanceID,DocumentID"`
TakenAt time.Time `meta:"DateTimeOriginal,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime,SubSecDateTimeOriginal,SubSecCreateDate" xmp:"DateCreated"` TakenAt time.Time `meta:"SubSecDateTimeOriginal,SubSecCreateDate,DateTimeOriginal,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime" xmp:"DateCreated"`
TakenAtLocal time.Time `meta:"DateTimeOriginal,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime,SubSecDateTimeOriginal,SubSecCreateDate"` TakenAtLocal time.Time `meta:"SubSecDateTimeOriginal,SubSecCreateDate,DateTimeOriginal,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime"`
TakenGps time.Time `meta:"GPSDateTime,GPSDateStamp"` TakenGps time.Time `meta:"GPSDateTime,GPSDateStamp"`
TakenNs int `meta:"-"` TakenNs int `meta:"-"`
TimeZone string `meta:"-"` TimeZone string `meta:"-"`

8
internal/meta/json_test.go
View file

@ -687,8 +687,8 @@ func TestJSON(t *testing.T) {
assert.Equal(t, CodecJpeg, data.Codec) assert.Equal(t, CodecJpeg, data.Codec)
assert.Equal(t, "0s", data.Duration.String()) assert.Equal(t, "0s", data.Duration.String())
assert.Equal(t, "2016-09-07 12:49:23 +0000 UTC", data.TakenAtLocal.String()) assert.Equal(t, "2016-09-07 12:49:23.373 +0000 UTC", data.TakenAtLocal.String())
assert.Equal(t, "2016-09-07 12:49:23 +0000 UTC", data.TakenAt.String()) assert.Equal(t, "2016-09-07 12:49:23.373 +0000 UTC", data.TakenAt.String())
assert.Equal(t, 373000000, data.TakenNs) assert.Equal(t, 373000000, data.TakenNs)
assert.Equal(t, "", data.TimeZone) assert.Equal(t, "", data.TimeZone)
assert.Equal(t, 4032, data.Width) assert.Equal(t, 4032, data.Width)
@ -714,8 +714,8 @@ func TestJSON(t *testing.T) {
assert.Equal(t, CodecJpeg, data.Codec) assert.Equal(t, CodecJpeg, data.Codec)
assert.Equal(t, "0s", data.Duration.String()) assert.Equal(t, "0s", data.Duration.String())
assert.Equal(t, "2016-09-07 12:49:23 +0000 UTC", data.TakenAtLocal.String()) assert.Equal(t, "2016-09-07 12:49:23.373 +0000 UTC", data.TakenAtLocal.String())
assert.Equal(t, "2016-09-07 12:49:23 +0000 UTC", data.TakenAt.String()) assert.Equal(t, "2016-09-07 12:49:23.373 +0000 UTC", data.TakenAt.String())
assert.Equal(t, "", data.TimeZone) assert.Equal(t, "", data.TimeZone)
assert.Equal(t, 4032, data.Width) assert.Equal(t, 4032, data.Width)
assert.Equal(t, 3024, data.Height) assert.Equal(t, 3024, data.Height)