From 7bc3dace4ce94033294accc02fea022a0b4ba623 Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 9 Apr 2020 14:26:42 -0400 Subject: [PATCH] Revert "Improve ffmpeg's error diagnostic" This reverts commit 4fc88f23 --- scanner/metadata_ffmpeg.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scanner/metadata_ffmpeg.go b/scanner/metadata_ffmpeg.go index 10f82c9ce..4f2474149 100644 --- a/scanner/metadata_ffmpeg.go +++ b/scanner/metadata_ffmpeg.go @@ -3,7 +3,6 @@ package scanner import ( "bufio" "errors" - "fmt" "mime" "os" "os/exec" @@ -75,17 +74,14 @@ func LoadAllAudioFiles(dirPath string) (map[string]os.FileInfo, error) { } func ExtractAllMetadata(inputs []string) (map[string]*Metadata, error) { - mds := map[string]*Metadata{} cmdLine, args := createProbeCommand(inputs) log.Trace("Executing command", "arg0", cmdLine, "args", args) cmd := exec.Command(cmdLine, args...) - output, err := cmd.CombinedOutput() - if err != nil { - return mds, fmt.Errorf("error extracting metadata files: %s", err) - } + output, _ := cmd.CombinedOutput() + mds := map[string]*Metadata{} 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)) for file, info := range infos {