mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix(server): FFmpegPath can contain spaces

Browse source
This commit is contained in:
Deluan 2024-10-20 13:58:39 -04:00
parent 97c06aba1a
commit 28668782c6
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/ffmpeg/ffmpeg.go
View file

@ -153,31 +153,27 @@ func (j *ffCmd) wait() {
// Path will always be an absolute path
func createFFmpegCommand(cmd, path string, maxBitRate, offset int) []string {
split := strings.Split(fixCmd(cmd), " ")
var parts []string
for _, s := range split {
var args []string
for _, s := range fixCmd(cmd) {
if strings.Contains(s, "%s") {
s = strings.ReplaceAll(s, "%s", path)
parts = append(parts, s)
args = append(args, s)
if offset > 0 && !strings.Contains(cmd, "%t") {
parts = append(parts, "-ss", strconv.Itoa(offset))
args = append(args, "-ss", strconv.Itoa(offset))
}
} else {
s = strings.ReplaceAll(s, "%t", strconv.Itoa(offset))
s = strings.ReplaceAll(s, "%b", strconv.Itoa(maxBitRate))
parts = append(parts, s)
args = append(args, s)
}
}
return parts
return args
}
func createProbeCommand(cmd string, inputs []string) []string {
split := strings.Split(fixCmd(cmd), " ")
var args []string
for _, s := range split {
for _, s := range fixCmd(cmd) {
if s == "%s" {
for _, inp := range inputs {
args = append(args, "-i", inp)
@ -189,7 +185,7 @@ func createProbeCommand(cmd string, inputs []string) []string {
return args
}
func fixCmd(cmd string) string {
func fixCmd(cmd string) []string {
split := strings.Split(cmd, " ")
var result []string
cmdPath, _ := ffmpegCmd()
@ -200,7 +196,7 @@ func fixCmd(cmd string) string {
result = append(result, s)
}
}
return strings.Join(result, " ")
return result
}
func ffmpegCmd() (string, error) {
@ -223,6 +219,7 @@ func ffmpegCmd() (string, error) {
return ffmpegPath, ffmpegErr
}
// These variables are accessible here for tests. Do not use them directly in production code. Use ffmpegCmd() instead.
var (
ffOnce sync.Once
ffmpegPath string