mirror of
https://github.com/stashapp/stash.git
synced 2025-12-06 08:26:00 +01:00
1b7e729750
* Update Scenes' 'Updated At' Date on Heatmap Gen & Expand Error Log The UpdatedAt field of a scene is now correctly updated after Generate Task is run and a heatmap linked to a scene.. I thought it made more sense here in the generate heatmap compared to scan.go, owing to funscript data not being tracked/stored in a typical sense with the scan message "updating metadata". I used a simplified error messaging as I did not think it was critcal but I do not know if did not use the correct code structure If updating the UpdatedAt field should be done there when the file is marked as interactive I can try and do that? This would fix this long-standing issue https://github.com/stashapp/stash/issues/3738 The error message change is useful as I could not tell which scripts were causing errors before but now it is clear in the logs * Use single transaction --------- Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
85 lines
2.4 KiB
Go
85 lines
2.4 KiB
Go
package manager
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/stashapp/stash/pkg/file/video"
|
|
"github.com/stashapp/stash/pkg/fsutil"
|
|
"github.com/stashapp/stash/pkg/logger"
|
|
"github.com/stashapp/stash/pkg/models"
|
|
)
|
|
|
|
type GenerateInteractiveHeatmapSpeedTask struct {
|
|
repository models.Repository
|
|
Scene models.Scene
|
|
Overwrite bool
|
|
fileNamingAlgorithm models.HashAlgorithm
|
|
}
|
|
|
|
func (t *GenerateInteractiveHeatmapSpeedTask) GetDescription() string {
|
|
return fmt.Sprintf("Generating heatmap and speed for %s", t.Scene.Path)
|
|
}
|
|
|
|
func (t *GenerateInteractiveHeatmapSpeedTask) Start(ctx context.Context) {
|
|
if !t.required() {
|
|
return
|
|
}
|
|
|
|
videoChecksum := t.Scene.GetHash(t.fileNamingAlgorithm)
|
|
funscriptPath := video.GetFunscriptPath(t.Scene.Path)
|
|
heatmapPath := instance.Paths.Scene.GetInteractiveHeatmapPath(videoChecksum)
|
|
drawRange := instance.Config.GetDrawFunscriptHeatmapRange()
|
|
|
|
generator := NewInteractiveHeatmapSpeedGenerator(drawRange)
|
|
|
|
err := generator.Generate(funscriptPath, heatmapPath, t.Scene.Files.Primary().Duration)
|
|
|
|
if err != nil {
|
|
logger.Errorf("error generating heatmap for %s: %s", t.Scene.Path, err.Error())
|
|
return
|
|
}
|
|
|
|
median := generator.InteractiveSpeed
|
|
|
|
r := t.repository
|
|
if err := r.WithTxn(ctx, func(ctx context.Context) error {
|
|
primaryFile := t.Scene.Files.Primary()
|
|
primaryFile.InteractiveSpeed = &median
|
|
if err := r.File.Update(ctx, primaryFile); err != nil {
|
|
return fmt.Errorf("updating interactive speed for %s: %w", primaryFile.Path, err)
|
|
}
|
|
|
|
// update the scene UpdatedAt field
|
|
// NewScenePartial sets the UpdatedAt field to the current time
|
|
if _, err := r.Scene.UpdatePartial(ctx, t.Scene.ID, models.NewScenePartial()); err != nil {
|
|
return fmt.Errorf("updating UpdatedAt field for scene %d: %w", t.Scene.ID, err)
|
|
}
|
|
return nil
|
|
}); err != nil && ctx.Err() == nil {
|
|
logger.Error(err.Error())
|
|
}
|
|
}
|
|
|
|
func (t *GenerateInteractiveHeatmapSpeedTask) required() bool {
|
|
primaryFile := t.Scene.Files.Primary()
|
|
if primaryFile == nil || !primaryFile.Interactive {
|
|
return false
|
|
}
|
|
|
|
if t.Overwrite {
|
|
return true
|
|
}
|
|
|
|
sceneHash := t.Scene.GetHash(t.fileNamingAlgorithm)
|
|
return !t.doesHeatmapExist(sceneHash) || primaryFile.InteractiveSpeed == nil
|
|
}
|
|
|
|
func (t *GenerateInteractiveHeatmapSpeedTask) doesHeatmapExist(sceneChecksum string) bool {
|
|
if sceneChecksum == "" {
|
|
return false
|
|
}
|
|
|
|
imageExists, _ := fsutil.FileExists(instance.Paths.Scene.GetInteractiveHeatmapPath(sceneChecksum))
|
|
return imageExists
|
|
}
|