Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-04-26 00:41:40 +02:00
Code Issues Projects Releases Wiki Activity

Fixed incorrect file paths on windows

Browse source
This commit is contained in:
Stash Dev 2019-02-10 09:33:18 -08:00
parent 8efbfc6d72
commit a5442a87a4
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,5 +1,7 @@
# Stash
[![Build Status](https://travis-ci.org/stashapp/stash.svg?branch=master)](https://travis-ci.org/stashapp/stash)
**Stash is a rails app which organizes and serves your porn.**
See a demo [here](https://vimeo.com/275537038) (password is stashapp).

10
manager/generator_preview.go
View file

@ -7,7 +7,7 @@ import (
"github.com/stashapp/stash/logger"
"github.com/stashapp/stash/utils"
"os"
"path"
"path/filepath"
)
type PreviewGenerator struct {
@ -74,7 +74,7 @@ func (g *PreviewGenerator) generateConcatFile() error {
}
func (g *PreviewGenerator) generateVideo(encoder *ffmpeg.Encoder) error {
outputPath := path.Join(g.OutputDirectory, g.VideoFilename)
outputPath := filepath.Join(g.OutputDirectory, g.VideoFilename)
outputExists, _ := utils.FileExists(outputPath)
if outputExists {
return nil
@ -95,20 +95,20 @@ func (g *PreviewGenerator) generateVideo(encoder *ffmpeg.Encoder) error {
encoder.ScenePreviewVideoChunk(g.Info.VideoFile, options)
}
videoOutputPath := path.Join(g.OutputDirectory, g.VideoFilename)
videoOutputPath := filepath.Join(g.OutputDirectory, g.VideoFilename)
encoder.ScenePreviewVideoChunkCombine(g.Info.VideoFile, g.getConcatFilePath(), videoOutputPath)
logger.Debug("created video preview: ", videoOutputPath)
return nil
}
func (g *PreviewGenerator) generateImage(encoder *ffmpeg.Encoder) error {
outputPath := path.Join(g.OutputDirectory, g.ImageFilename)
outputPath := filepath.Join(g.OutputDirectory, g.ImageFilename)
outputExists, _ := utils.FileExists(outputPath)
if outputExists {
return nil
}
videoPreviewPath := path.Join(g.OutputDirectory, g.VideoFilename)
videoPreviewPath := filepath.Join(g.OutputDirectory, g.VideoFilename)
tmpOutputPath := instance.Paths.Generated.GetTmpPath(g.ImageFilename)
if err := encoder.ScenePreviewVideoToImage(g.Info.VideoFile, 640, videoPreviewPath, tmpOutputPath); err != nil {
return err

4
manager/task_generate_markers.go
View file

@ -6,7 +6,7 @@ import (
"github.com/stashapp/stash/models"
"github.com/stashapp/stash/utils"
"os"
"path"
"path/filepath"
"strconv"
"sync"
)
@ -32,7 +32,7 @@ func (t *GenerateMarkersTask) Start(wg *sync.WaitGroup) {
}
// Make the folder for the scenes markers
markersFolder := path.Join(instance.Paths.Generated.Markers, t.Scene.Checksum)
markersFolder := filepath.Join(instance.Paths.Generated.Markers, t.Scene.Checksum)
_ = utils.EnsureDir(markersFolder)
encoder := ffmpeg.NewEncoder(instance.Paths.FixedPaths.FFMPEG)