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

Fix generation

Browse Source
This commit is contained in:
Stash Dev
2019-05-04 12:18:52 -07:00
committed by StashAppDev
parent b866185179
commit 7a18c54c6e
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/manager/generator_preview.go
View File

@@ -41,7 +41,6 @@ func NewPreviewGenerator(videoFile ffmpeg.VideoFile, videoFilename string, image
} }
func (g *PreviewGenerator) Generate() error { func (g *PreviewGenerator) Generate() error {
instance.Paths.Generated.EmptyTmpDir()
logger.Infof("[generator] generating scene preview for %s", g.Info.VideoFile.Path) logger.Infof("[generator] generating scene preview for %s", g.Info.VideoFile.Path)
encoder := ffmpeg.NewEncoder(instance.FFMPEGPath) encoder := ffmpeg.NewEncoder(instance.FFMPEGPath)

1
pkg/manager/generator_sprite.go
View File

@@ -48,7 +48,6 @@ func NewSpriteGenerator(videoFile ffmpeg.VideoFile, imageOutputPath string, vttO
} }
func (g *SpriteGenerator) Generate() error { func (g *SpriteGenerator) Generate() error {
instance.Paths.Generated.EmptyTmpDir()
encoder := ffmpeg.NewEncoder(instance.FFMPEGPath) encoder := ffmpeg.NewEncoder(instance.FFMPEGPath)
if err := g.generateSpriteImage(&encoder); err != nil { if err := g.generateSpriteImage(&encoder); err != nil {

5
pkg/manager/manager_tasks.go
View File

@@ -95,6 +95,11 @@ func (s *singleton) Generate(sprites bool, previews bool, markers bool, transcod
for _, scene := range scenes { for _, scene := range scenes {
wg.Add(delta) wg.Add(delta)
// Clear the tmp directory for each scene
if sprites || previews || markers {
instance.Paths.Generated.EmptyTmpDir()
}
if sprites { if sprites {
task := GenerateSpriteTask{Scene: scene} task := GenerateSpriteTask{Scene: scene}
go task.Start(&wg) go task.Start(&wg)

1
pkg/manager/task_generate_markers.go
View File

@@ -18,7 +18,6 @@ type GenerateMarkersTask struct {
func (t *GenerateMarkersTask) Start(wg *sync.WaitGroup) { func (t *GenerateMarkersTask) Start(wg *sync.WaitGroup) {
defer wg.Done() defer wg.Done()
instance.Paths.Generated.EmptyTmpDir()
qb := models.NewSceneMarkerQueryBuilder() qb := models.NewSceneMarkerQueryBuilder()
sceneMarkers, _ := qb.FindBySceneID(t.Scene.ID, nil) sceneMarkers, _ := qb.FindBySceneID(t.Scene.ID, nil)
if len(sceneMarkers) == 0 { if len(sceneMarkers) == 0 {