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

Index: Create a new photo record if UID was restored from YAML #4063

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2024-02-09 11:54:31 +01:00
parent 31461e9a01
commit 1e1abb4035
2 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/entity/photo.go
View file

@ -288,6 +288,7 @@ func FindPhoto(find Photo) *Photo {
m := Photo{} m := Photo{}
// Preload related entities if a matching record is found.
stmt := UnscopedDb(). stmt := UnscopedDb().
Preload("Labels", func(db *gorm.DB) *gorm.DB { Preload("Labels", func(db *gorm.DB) *gorm.DB {
return db.Order("photos_labels.uncertainty ASC, photos_labels.label_id DESC") return db.Order("photos_labels.uncertainty ASC, photos_labels.label_id DESC")
@ -300,14 +301,14 @@ func FindPhoto(find Photo) *Photo {
Preload("Cell"). Preload("Cell").
Preload("Cell.Place") Preload("Cell.Place")
// Search for UID. // Find photo by uid.
if rnd.IsUID(find.PhotoUID, PhotoUID) { if rnd.IsUID(find.PhotoUID, PhotoUID) {
if stmt.First(&m, "photo_uid = ?", find.PhotoUID).Error == nil { if stmt.First(&m, "photo_uid = ?", find.PhotoUID).Error == nil {
return &m return &m
} }
} }
// Search for ID. // Find photo by id.
if find.ID > 0 { if find.ID > 0 {
if stmt.First(&m, "id = ?", find.ID).Error == nil { if stmt.First(&m, "id = ?", find.ID).Error == nil {
return &m return &m
@ -526,7 +527,7 @@ func (m *Photo) PreloadMany() {
m.PreloadAlbums() m.PreloadAlbums()
} }
// HasID tests if the photo has a database id and uid. // HasID checks if the photo has an id and uid assigned to it.
func (m *Photo) HasID() bool { func (m *Photo) HasID() bool {
return m.ID > 0 && m.PhotoUID != "" return m.ID > 0 && m.PhotoUID != ""
} }

53
internal/photoprism/index_mediafile.go
View file

@ -17,6 +17,7 @@ import (
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/media" "github.com/photoprism/photoprism/pkg/media"
"github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"
"github.com/photoprism/photoprism/pkg/video" "github.com/photoprism/photoprism/pkg/video"
) )
@ -180,8 +181,17 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
} }
} }
} else if fileExists { } else if fileExists {
// Find photo by id if file exists. // Find photo by the id or uid assigned to the file.
photoQuery = entity.UnscopedDb().First(&photo, "id = ?", file.PhotoID) if file.PhotoID > 0 {
photoQuery = entity.UnscopedDb().First(&photo, "id = ?", file.PhotoID)
} else if rnd.IsUID(file.PhotoUID, entity.PhotoUID) {
photoQuery = entity.UnscopedDb().First(&photo, "photo_uid = ?", file.PhotoUID)
} else {
// Should never happen.
result.Status = IndexFailed
result.Err = fmt.Errorf("index: file %s has no photo id or uid assigned - you may have found a bug, please report", logName)
return result
}
} else { } else {
// Should never happen. // Should never happen.
result.Status = IndexFailed result.Status = IndexFailed
@ -227,12 +237,12 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
} }
// Remove file from duplicates table if exists. // Remove file from duplicates table if exists.
if err := entity.PurgeDuplicate(m.RootRelName(), m.Root()); err != nil { if err = entity.PurgeDuplicate(m.RootRelName(), m.Root()); err != nil {
log.Errorf("index: %s in %s (purge duplicate)", err, m.RootRelName()) log.Errorf("index: %s in %s (purge duplicate)", err, m.RootRelName())
} }
// Create default thumbnails if needed. // Create default thumbnails if needed.
if err := m.CreateThumbnails(ind.thumbPath(), false); err != nil { if err = m.CreateThumbnails(ind.thumbPath(), false); err != nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: failed creating thumbnails for %s (%s)", clean.Log(m.RootRelName()), err.Error()) result.Err = fmt.Errorf("index: failed creating thumbnails for %s (%s)", clean.Log(m.RootRelName()), err.Error())
return result return result
@ -250,7 +260,7 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
} }
if yamlName := fs.SidecarYAML.FindFirst(m.FileName(), []string{Config().SidecarPath(), fs.PPHiddenPathname}, Config().OriginalsPath(), stripSequence); yamlName != "" { if yamlName := fs.SidecarYAML.FindFirst(m.FileName(), []string{Config().SidecarPath(), fs.PPHiddenPathname}, Config().OriginalsPath(), stripSequence); yamlName != "" {
if err := photo.LoadFromYaml(yamlName); err != nil { if err = photo.LoadFromYaml(yamlName); err != nil {
log.Errorf("index: %s in %s (restore from yaml)", err.Error(), logName) log.Errorf("index: %s in %s (restore from yaml)", err.Error(), logName)
} else { } else {
photoExists = true photoExists = true
@ -810,14 +820,15 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
file.SetColorProfile(m.ColorProfile()) file.SetColorProfile(m.ColorProfile())
} }
// Update existing photo? // Update existing photo entity?
if photoExists || photo.HasID() { if photo.HasID() {
if err := photo.Save(); err != nil { if err = photo.Save(); err != nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: %s in %s (update existing photo)", err, logName) result.Err = fmt.Errorf("index: %s in %s (update existing photo)", err, logName)
return result return result
} }
} else { } else {
// Create a new photo entity or load the existing entity if it exists.
if p := photo.FirstOrCreate(); p == nil { if p := photo.FirstOrCreate(); p == nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: failed to create %s", logName) result.Err = fmt.Errorf("index: failed to create %s", logName)
@ -857,11 +868,11 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
file.PhotoUID = photo.PhotoUID file.PhotoUID = photo.PhotoUID
result.PhotoUID = photo.PhotoUID result.PhotoUID = photo.PhotoUID
// Main JPEG file. // Set photo properties based on primary file.
if file.FilePrimary { if file.FilePrimary {
labels := photo.ClassifyLabels() photoLabels := photo.ClassifyLabels()
if err := photo.UpdateTitle(labels); err != nil { if err = photo.UpdateTitle(photoLabels); err != nil {
log.Debugf("%s in %s (update title)", err, logName) log.Debugf("%s in %s (update title)", err, logName)
} }
@ -882,7 +893,7 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
w = append(w, txt.FilenameKeywords(filePath)...) w = append(w, txt.FilenameKeywords(filePath)...)
w = append(w, locKeywords...) w = append(w, locKeywords...)
w = append(w, file.FileMainColor) w = append(w, file.FileMainColor)
w = append(w, labels.Keywords()...) w = append(w, photoLabels.Keywords()...)
details.Keywords = strings.Join(txt.UniqueWords(w), ", ") details.Keywords = strings.Join(txt.UniqueWords(w), ", ")
@ -894,24 +905,24 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
photo.PhotoQuality = photo.QualityScore() photo.PhotoQuality = photo.QualityScore()
if err := photo.Save(); err != nil { if err = photo.Save(); err != nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: %s in %s (update metadata)", err, logName) result.Err = fmt.Errorf("index: %s in %s (update metadata)", err, logName)
return result return result
} }
if err := photo.SyncKeywordLabels(); err != nil { if err = photo.SyncKeywordLabels(); err != nil {
log.Errorf("index: %s in %s (sync keywords and labels)", err, logName) log.Errorf("index: %s in %s (sync keywords and labels)", err, logName)
} }
if err := photo.IndexKeywords(); err != nil { if err = photo.IndexKeywords(); err != nil {
log.Errorf("index: %s in %s (save keywords)", err, logName) log.Errorf("index: %s in %s (save keywords)", err, logName)
} }
if err := query.AlbumEntryFound(photo.PhotoUID); err != nil { if err = query.AlbumEntryFound(photo.PhotoUID); err != nil {
log.Errorf("index: %s in %s (remove missing flag from album entry)", err, logName) log.Errorf("index: %s in %s (remove missing flag from album entry)", err, logName)
} }
} else if err := photo.UpdateQuality(); err != nil { } else if err = photo.UpdateQuality(); err != nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: %s in %s (update quality)", err, logName) result.Err = fmt.Errorf("index: %s in %s (update quality)", err, logName)
return result return result
@ -922,7 +933,7 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
if fileQuery.Error == nil { if fileQuery.Error == nil {
file.UpdatedIn = int64(time.Since(start)) file.UpdatedIn = int64(time.Since(start))
if err := file.Save(); err != nil { if err = file.Save(); err != nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: %s in %s (update existing file)", err, logName) result.Err = fmt.Errorf("index: %s in %s (update existing file)", err, logName)
return result return result
@ -930,7 +941,7 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
} else { } else {
file.CreatedIn = int64(time.Since(start)) file.CreatedIn = int64(time.Since(start))
if err := file.Create(); err != nil { if err = file.Create(); err != nil {
result.Status = IndexFailed result.Status = IndexFailed
result.Err = fmt.Errorf("index: %s in %s (add new file)", err, logName) result.Err = fmt.Errorf("index: %s in %s (add new file)", err, logName)
return result return result
@ -963,7 +974,7 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
downloadedAs = originalName downloadedAs = originalName
} }
if err := query.SetDownloadFileID(downloadedAs, file.ID); err != nil { if err = query.SetDownloadFileID(downloadedAs, file.ID); err != nil {
log.Errorf("index: %s in %s (set download id)", err, logName) log.Errorf("index: %s in %s (set download id)", err, logName)
} }
@ -985,7 +996,7 @@ func (ind *Index) UserMediaFile(m *MediaFile, o IndexOptions, originalName, phot
// Write YAML sidecar file (optional). // Write YAML sidecar file (optional).
yamlFile := photo.YamlFileName(Config().OriginalsPath(), Config().SidecarPath()) yamlFile := photo.YamlFileName(Config().OriginalsPath(), Config().SidecarPath())
if err := photo.SaveAsYaml(yamlFile); err != nil { if err = photo.SaveAsYaml(yamlFile); err != nil {
log.Errorf("index: %s in %s (update yaml)", err.Error(), logName) log.Errorf("index: %s in %s (update yaml)", err.Error(), logName)
} else { } else {
log.Debugf("index: updated yaml file %s", clean.Log(filepath.Base(yamlFile))) log.Debugf("index: updated yaml file %s", clean.Log(filepath.Base(yamlFile)))