arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Revert "Improve ffmpeg's error diagnostic"

Browse Source 
This reverts commit 4fc88f23
This commit is contained in:
Deluan
2020-04-09 14:26:42 -04:00
parent c2ec142ce3
commit 7bc3dace4c
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/metadata_ffmpeg.go
+3 -7
View File
@@ -3,7 +3,6 @@ package scanner
import ( import (
"bufio" "bufio"
"errors" "errors"
"fmt"
"mime" "mime"
"os" "os"
"os/exec" "os/exec"
@@ -75,17 +74,14 @@ 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) {
mds := map[string]*Metadata{}
cmdLine, args := createProbeCommand(inputs) cmdLine, args := createProbeCommand(inputs)
log.Trace("Executing command", "arg0", cmdLine, "args", args) log.Trace("Executing command", "arg0", cmdLine, "args", args)
cmd := exec.Command(cmdLine, args...) cmd := exec.Command(cmdLine, args...)
output, err := cmd.CombinedOutput() output, _ := cmd.CombinedOutput()
if err != nil { mds := map[string]*Metadata{}
return mds, fmt.Errorf("error extracting metadata files: %s", err)
}
if len(output) == 0 { if len(output) == 0 {
return mds, errors.New("error extracting metadata files: no output") return mds, errors.New("error extracting metadata files")
} }
infos := parseOutput(string(output)) infos := parseOutput(string(output))
for file, info := range infos { for file, info := range infos {