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

Refactor a bit how ffmpeg is used to get metadata

Browse source 
- createProbeCommand returns a []string instead of (string, string[])
- Simplify the loop of createProbeCommand
This commit is contained in:
jvoisin 2020-04-11 12:42:47 +02:00 • committed by Deluan Quintão
parent 6a3a66975c
commit 04eb421186
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/configuration.go
View file

@ -29,7 +29,7 @@ type nd struct {
TranscodingCacheSize string `default:"100MB"` // in MB TranscodingCacheSize string `default:"100MB"` // in MB
ImageCacheSize string `default:"100MB"` // in MB ImageCacheSize string `default:"100MB"` // in MB
ProbeCommand string `default:"ffmpeg -i %s -f ffmetadata"` ProbeCommand string `default:"ffmpeg %s -f ffmetadata"`
// DevFlags. These are used to enable/disable debugging and incomplete features // DevFlags. These are used to enable/disable debugging and incomplete features
DevLogSourceLine bool `default:"false"` DevLogSourceLine bool `default:"false"`

27
scanner/metadata_ffmpeg.go
View file

@ -74,10 +74,10 @@ func LoadAllAudioFiles(dirPath string) (map[string]os.FileInfo, error) {
} }
func ExtractAllMetadata(inputs []string) (map[string]*Metadata, error) { func ExtractAllMetadata(inputs []string) (map[string]*Metadata, error) {
cmdLine, args := createProbeCommand(inputs) args := createProbeCommand(inputs)
log.Trace("Executing command", "arg0", cmdLine, "args", args) log.Trace("Executing command", "args", args)
cmd := exec.Command(cmdLine, args...) cmd := exec.Command(args[0], args[1:]...)
output, _ := cmd.CombinedOutput() output, _ := cmd.CombinedOutput()
mds := map[string]*Metadata{} mds := map[string]*Metadata{}
if len(output) == 0 { if len(output) == 0 {
@ -269,25 +269,18 @@ func (m *Metadata) parseDuration(tagName string) float32 {
} }
// Inputs will always be absolute paths // Inputs will always be absolute paths
func createProbeCommand(inputs []string) (string, []string) { func createProbeCommand(inputs []string) []string {
cmd := conf.Server.ProbeCommand split := strings.Split(conf.Server.ProbeCommand, " ")
split := strings.Split(cmd, " ")
args := make([]string, 0) args := make([]string, 0)
first := true
for _, s := range split { for _, s := range split {
if s == "%s" { if s == "%s" {
for _, inp := range inputs { for _, inp := range inputs {
if !first { args = append(args, "-i", inp)
args = append(args, "-i")
}
args = append(args, inp)
first = false
} }
continue } else {
args = append(args, s)
} }
args = append(args, s)
} }
return args
return args[0], args[1:]
} }