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

Indexer: Improve taken date fallback when other metadata is missing #930

Browse source
This commit is contained in:
Michael Mayer 2021-01-25 21:41:57 +01:00
parent 378dd0812e
commit ef2f231d5b
3 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
internal/entity/photo.go
View file

@ -857,19 +857,34 @@ func (m *Photo) SetTakenAt(taken, local time.Time, zone, source string) {
return
}
m.TakenAt = taken.Round(time.Second).UTC()
// Round times to avoid jitter.
taken = taken.Round(time.Second).UTC()
local = local.Round(time.Second)
// Don't update older date.
if SrcPriority[source] <= SrcPriority[SrcName] && !m.TakenAt.IsZero() && taken.After(m.TakenAt) {
return
}
m.TakenAt = taken
m.TakenSrc = source
if local.IsZero() || local.Year() < 1000 {
m.TakenAtLocal = m.TakenAt
} else {
m.TakenAtLocal = local.Round(time.Second)
m.TakenAtLocal = local
}
// Set time zone.
if zone != "" {
m.TimeZone = zone
}
// Apply time zone.
if m.TimeZone != "" {
m.TakenAt = m.GetTakenAt()
}
m.UpdateDateFields()
}
@ -883,7 +898,10 @@ func (m *Photo) SetTimeZone(zone, source string) {
return
}
// Set time zone.
m.TimeZone = zone
// Apply time zone.
m.TakenAt = m.GetTakenAt()
}

19
internal/entity/photo_test.go
View file

@ -557,11 +557,30 @@ func TestPhoto_SetTakenAt(t *testing.T) {
m := PhotoFixtures.Get("Photo15")
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAt)
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAtLocal)
m.SetTakenAt(time.Date(2019, 12, 11, 9, 7, 18, 0, time.UTC),
time.Date(2019, 12, 11, 10, 7, 18, 0, time.UTC), "", SrcMeta)
assert.Equal(t, time.Date(2019, 12, 11, 9, 7, 18, 0, time.UTC), m.TakenAt)
assert.Equal(t, time.Date(2019, 12, 11, 10, 7, 18, 0, time.UTC), m.TakenAtLocal)
})
t.Run("fallback and time zone", func(t *testing.T) {
m := PhotoFixtures.Get("Photo15")
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAt)
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAtLocal)
m.SetTakenAt(time.Date(2019, 12, 11, 9, 7, 18, 0, time.UTC),
time.Date(2019, 12, 11, 10, 7, 18, 0, time.UTC), "", SrcName)
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAt)
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAtLocal)
m.SetTakenAt(time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC),
time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), "Europe/Berlin", SrcName)
assert.Equal(t, time.Date(2013, 11, 11, 8, 7, 18, 0, time.UTC), m.TakenAt)
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAtLocal)
})
t.Run("time > max year", func(t *testing.T) {
m := PhotoFixtures.Get("Photo15")
assert.Equal(t, time.Date(2013, 11, 11, 9, 7, 18, 0, time.UTC), m.TakenAt)

11
internal/photoprism/index_mediafile.go
View file

@ -521,6 +521,12 @@ func (ind *Index) MediaFile(m *MediaFile, o IndexOptions, originalName string) (
}
}
// Try to set taken date based on file mod time or name if other metadata is missing:
if m.IsMedia() && (photo.TakenSrc == entity.SrcAuto || photo.TakenSrc == entity.SrcName) {
takenUtc, takenSrc := m.TakenAt()
photo.SetTakenAt(takenUtc, takenUtc, "", takenSrc)
}
// file obviously exists: remove deleted and missing flags
file.DeletedAt = nil
file.FileMissing = false
@ -588,11 +594,6 @@ func (ind *Index) MediaFile(m *MediaFile, o IndexOptions, originalName string) (
photo.PhotoExposure = m.Exposure()
}
if photo.TakenSrc == entity.SrcAuto || photo.TakenSrc == entity.SrcName {
takenUtc, takenSrc := m.TakenAt()
photo.SetTakenAt(takenUtc, takenUtc, "", takenSrc)
}
var locLabels classify.Labels
locKeywords, locLabels = photo.UpdateLocation()