Fixed weird windows path issue

This commit is contained in:
Stash Dev 2019-02-10 10:13:23 -08:00
parent a5442a87a4
commit 0472f9a8ed
3 changed files with 19 additions and 7 deletions

View File

@ -8,8 +8,7 @@ import (
"github.com/jmoiron/sqlx"
_ "github.com/mattn/go-sqlite3"
"github.com/stashapp/stash/logger"
"runtime"
"strings"
"github.com/stashapp/stash/utils"
)
var DB *sqlx.DB
@ -44,10 +43,7 @@ func runMigrations(databasePath string) {
Migrations: source.NewMigrations(),
}
// Golang migrate has an issue where the \ isn't recognized as a valid on windows
if runtime.GOOS == "windows" {
databasePath = strings.Replace(databasePath, "\\", "/", -1)
}
databasePath = utils.FixWindowsPath(databasePath)
s, _ := WithInstance(packrSource)
m, err := migrate.NewWithSourceInstance(
"packr2",

View File

@ -2,6 +2,7 @@ package ffmpeg
import (
"fmt"
"github.com/stashapp/stash/utils"
"strconv"
)
@ -36,7 +37,7 @@ func (e *Encoder) ScenePreviewVideoChunkCombine(probeResult VideoFile, concatFil
args := []string{
"-v", "quiet",
"-f", "concat",
"-i", concatFilePath,
"-i", utils.FixWindowsPath(concatFilePath),
"-y",
"-c", "copy",
outputPath,

15
utils/windows.go Normal file
View File

@ -0,0 +1,15 @@
package utils
import (
"runtime"
"strings"
)
// Sometimes the \ isn't recognized as valid on windows
func FixWindowsPath(str string) string {
if runtime.GOOS == "windows" {
return strings.Replace(str, "\\", "/", -1)
} else {
return str
}
}