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

fix(server): allow extra spaces in transcoding commands

Browse Source
This commit is contained in:
Deluan 2024-10-20 19:09:09 -04:00
parent bbb3182bc9
commit 8808eaddda
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ffmpeg/ffmpeg.go
View File

@ -171,7 +171,7 @@ func createProbeCommand(cmd string, inputs []string) []string {
} }
func fixCmd(cmd string) []string { func fixCmd(cmd string) []string {
split := strings.Split(cmd, " ") split := strings.Fields(cmd)
cmdPath, _ := ffmpegCmd() cmdPath, _ := ffmpegCmd()
for i, s := range split { for i, s := range split {
if s == "ffmpeg" || s == "ffmpeg.exe" { if s == "ffmpeg" || s == "ffmpeg.exe" {

4
core/ffmpeg/ffmpeg_test.go
View File

@ -27,6 +27,10 @@ var _ = Describe("ffmpeg", func() {
args := createFFmpegCommand("ffmpeg -i %s -b:a %bk mp3 -", "/music library/file.mp3", 123, 0) args := createFFmpegCommand("ffmpeg -i %s -b:a %bk mp3 -", "/music library/file.mp3", 123, 0)
Expect(args).To(Equal([]string{"ffmpeg", "-i", "/music library/file.mp3", "-b:a", "123k", "mp3", "-"})) Expect(args).To(Equal([]string{"ffmpeg", "-i", "/music library/file.mp3", "-b:a", "123k", "mp3", "-"}))
}) })
It("handles extra spaces in the command string", func() {
args := createFFmpegCommand("ffmpeg -i %s -b:a %bk mp3 -", "/music library/file.mp3", 123, 0)
Expect(args).To(Equal([]string{"ffmpeg", "-i", "/music library/file.mp3", "-b:a", "123k", "mp3", "-"}))
})
Context("when command has time offset param", func() { Context("when command has time offset param", func() {
It("creates a valid command line with offset", func() { It("creates a valid command line with offset", func() {
args := createFFmpegCommand("ffmpeg -i %s -b:a %bk -ss %t mp3 -", "/music library/file.mp3", 123, 456) args := createFFmpegCommand("ffmpeg -i %s -b:a %bk -ss %t mp3 -", "/music library/file.mp3", 123, 456)