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

refactor: add -i to ffmpeg ProbeCommand. make it more consistent with the DownsampleCommand

Browse source
This commit is contained in:
Deluan 2020-02-03 23:04:58 -05:00
parent 8372dee000
commit 6e2454f6cc
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/configuration.go
View file

@ -25,7 +25,7 @@ type nd struct {
EnableDownsampling bool `default:"false"`
MaxBitRate int `default:"0"`
DownsampleCommand string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"`
ProbeCommand string `default:"ffmpeg %s -f ffmetadata"`
ProbeCommand string `default:"ffmpeg -i %s -f ffmetadata"`
ScanInterval string `default:"1m"`
// DevFlags. These are used to enable/disable debugging and incomplete features

9
scanner/metadata_ffmpeg.go
View file

@ -74,7 +74,7 @@ func ExtractAllMetadata(dirPath string) (map[string]*Metadata, error) {
func probe(inputs []string) (map[string]*Metadata, error) {
cmdLine, args := createProbeCommand(inputs)
log.Trace("Executing command", "cmdLine", cmdLine, "args", args)
log.Trace("Executing command", "arg0", cmdLine, "args", args)
cmd := exec.Command(cmdLine, args...)
output, _ := cmd.CombinedOutput()
mds := map[string]*Metadata{}
@ -233,10 +233,15 @@ func createProbeCommand(inputs []string) (string, []string) {
split := strings.Split(cmd, " ")
args := make([]string, 0)
first := true
for _, s := range split {
if s == "%s" {
for _, inp := range inputs {
args = append(args, "-i", inp)
if !first {
args = append(args, "-i")
}
args = append(args, inp)
first = false
}
continue
}