Skip to content

Commit

Permalink
refactor: add -i to ffmpeg ProbeCommand. make it more consistent with…
Browse files Browse the repository at this point in the history
… the DownsampleCommand
  • Loading branch information
deluan committed Feb 4, 2020
1 parent 8372dee commit 6e2454f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conf/configuration.go
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions scanner/metadata_ffmpeg.go
Expand Up @@ -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{}
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 6e2454f

Please sign in to comment.