mirror of
https://git.vectorsigma.ru/public/photoview.git
synced 2026-08-03 20:59:03 +00:00
1f8664d7f8
I encountered with the following error: > 2023/02/05 07:33:00 /app/scanner/face_detection/face_detector.go:92 sql: transaction has already been committed or rolled back > [0.042ms] [rows:0] SELECT * FROM `media` WHERE `media`.`id` = 823 ORDER BY `media`.`id` LIMIT 1 > 2023/02/05 07:33:00 ERROR: Error detecting faces in image (/photos/Borzsony2017/DSC_0028.NEF): sql: transaction has already been committed or rolled back It turned out it comes from the api/routes/photos.go I found a very similar code in album_scanner.go. The difference I saw was that while in the single photo request the transaction passed to the `scanner_tasks.Tasks.BeforeProcessMedia` call, in the album_scann.go the transaction created after this call and created from the context which returned by `BeforeProcessMedia`. Another difference was that in the `ProcessSingleMedia` call the `AfterProcessMedia` call was called with the same - db transaction - context, in the album_scanner it was called outside of the transaction. I changed the logic by merging the two behavior: Create the transaction from the context of `BeforeProcessMedia` and also use the transaction context in the `AfterProcessMedia`. After the change the error disappeared. So to have it in a common place I extracted that logic into a function and use for both the single photo request and in the album scanner. I did not go more deeper to find out what's going on with the context under the hood.
90 lines
2.3 KiB
Go
90 lines
2.3 KiB
Go
package scanner
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"os"
|
|
"path"
|
|
|
|
"github.com/photoview/photoview/api/graphql/models"
|
|
"github.com/photoview/photoview/api/scanner/media_encoding"
|
|
"github.com/photoview/photoview/api/scanner/scanner_cache"
|
|
"github.com/photoview/photoview/api/scanner/scanner_task"
|
|
"github.com/pkg/errors"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
func ScanMedia(tx *gorm.DB, mediaPath string, albumId int, cache *scanner_cache.AlbumScannerCache) (*models.Media, bool, error) {
|
|
mediaName := path.Base(mediaPath)
|
|
|
|
// Check if media already exists
|
|
{
|
|
var media []*models.Media
|
|
|
|
result := tx.Where("path_hash = ?", models.MD5Hash(mediaPath)).Find(&media)
|
|
|
|
if result.Error != nil {
|
|
return nil, false, errors.Wrap(result.Error, "scan media fetch from database")
|
|
}
|
|
|
|
if result.RowsAffected > 0 {
|
|
// log.Printf("Media already scanned: %s\n", mediaPath)
|
|
return media[0], false, nil
|
|
}
|
|
}
|
|
|
|
log.Printf("Scanning media: %s\n", mediaPath)
|
|
|
|
mediaType, err := cache.GetMediaType(mediaPath)
|
|
if err != nil {
|
|
return nil, false, errors.Wrap(err, "could determine if media was photo or video")
|
|
}
|
|
|
|
var mediaTypeText models.MediaType
|
|
|
|
if mediaType.IsVideo() {
|
|
mediaTypeText = models.MediaTypeVideo
|
|
} else {
|
|
mediaTypeText = models.MediaTypePhoto
|
|
}
|
|
|
|
stat, err := os.Stat(mediaPath)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
media := models.Media{
|
|
Title: mediaName,
|
|
Path: mediaPath,
|
|
AlbumID: albumId,
|
|
Type: mediaTypeText,
|
|
DateShot: stat.ModTime(),
|
|
}
|
|
|
|
if err := tx.Create(&media).Error; err != nil {
|
|
return nil, false, errors.Wrap(err, "could not insert media into database")
|
|
}
|
|
|
|
return &media, true, nil
|
|
}
|
|
|
|
// ProcessSingleMedia processes a single media, might be used to reprocess media with corrupted cache
|
|
// Function waits for processing to finish before returning.
|
|
func ProcessSingleMedia(db *gorm.DB, media *models.Media) error {
|
|
album_cache := scanner_cache.MakeAlbumCache()
|
|
|
|
var album models.Album
|
|
if err := db.Model(media).Association("Album").Find(&album); err != nil {
|
|
return err
|
|
}
|
|
|
|
media_data := media_encoding.NewEncodeMediaData(media)
|
|
|
|
task_context := scanner_task.NewTaskContext(context.Background(), db, &album, album_cache)
|
|
if err := scanMedia(task_context, media, &media_data, 0, 1); err != nil {
|
|
return errors.Wrap(err, "single media scan")
|
|
}
|
|
|
|
return nil
|
|
}
|