public/photoview
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/photoview.git synced 2026-08-03 21:09:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where DetectFaces would be called with the wrong media.

Browse Source 
This happend because the go routine did not capture the media variable,
and so the it would change before the go routine could start
and call the DetectFaces function.
This commit is contained in:
viktorstrate
2021-03-16 22:27:27 +01:00
parent 3ae92086cd
commit a14b12b8d4
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/scanner/scanner_album.go
View File

@@ -75,10 +75,11 @@ func scanAlbum(album *models.Album, cache *AlbumScannerCache, db *gorm.DB) {
album_has_changes := false
for count, media := range albumMedia {
// tx, err := db.Begin()
processing_was_needed := false
transactionError := db.Transaction(func(tx *gorm.DB) error {
processing_was_needed, err := ProcessMedia(tx, media)
log.Printf("Process media transaction enter (%s)", media.Path)
processing_was_needed, err = ProcessMedia(tx, media)
if err != nil {
return errors.Wrapf(err, "failed to process photo (%s)", media.Path)
}
@@ -93,22 +94,23 @@ func scanAlbum(album *models.Album, cache *AlbumScannerCache, db *gorm.DB) {
Content: fmt.Sprintf("Processed media at %s", media.Path),
Progress: &progress,
})
if media.Type == models.MediaTypePhoto {
go func() {
if err := face_detection.GlobalFaceDetector.DetectFaces(tx, media); err != nil {
ScannerError("Error detecting faces in image (%s): %s", media.Path, err)
}
}()
}
}
log.Printf("Process media transaction exit (%s)", media.Path)
return nil
})
if transactionError != nil {
ScannerError("Failed to begin database transaction: %s", transactionError)
}
if processing_was_needed && media.Type == models.MediaTypePhoto {
go func(media *models.Media) {
if err := face_detection.GlobalFaceDetector.DetectFaces(db, media); err != nil {
ScannerError("Error detecting faces in image (%s): %s", media.Path, err)
}
}(media)
}
}
cleanup_errors := CleanupMedia(db, album.ID, albumMedia)