Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 12:54:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move scene post update hook to outside Identify transaction (#1953)

Browse Source 
* Move update post hook call outside transaction
* Make Scene Movies resolver use read transaction
This commit is contained in:
WithoutPants
2021-11-06 09:58:52 +11:00
committed by GitHub
parent dbfd92f9a8
commit 5bb5f6f2ce
3 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/manager/task_identify.go
View File

@@ -130,25 +130,23 @@ func (j *IdentifyJob) identifyScene(ctx context.Context, s *models.Scene, source
return
}
if err := j.txnManager.WithTxn(context.TODO(), func(r models.Repository) error {
var taskError error
j.progress.ExecuteTask("Identifying "+s.Path, func() {
task := identify.SceneIdentifier{
DefaultOptions: j.input.Options,
Sources: sources,
ScreenshotSetter: &scene.PathsScreenshotSetter{
Paths: instance.Paths,
FileNamingAlgorithm: instance.Config.GetVideoFileNamingAlgorithm(),
},
SceneUpdatePostHookExecutor: j.postHookExecutor,
}
var taskError error
j.progress.ExecuteTask("Identifying "+s.Path, func() {
task := identify.SceneIdentifier{
DefaultOptions: j.input.Options,
Sources: sources,
ScreenshotSetter: &scene.PathsScreenshotSetter{
Paths: instance.Paths,
FileNamingAlgorithm: instance.Config.GetVideoFileNamingAlgorithm(),
},
SceneUpdatePostHookExecutor: j.postHookExecutor,
}
taskError = task.Identify(ctx, r, s)
})
taskError = task.Identify(ctx, j.txnManager, s)
})
return taskError
}); err != nil {
logger.Errorf("Error encountered identifying %s: %v", s.Path, err)
if taskError != nil {
logger.Errorf("Error encountered identifying %s: %v", s.Path, taskError)
}
j.progress.Increment()