From e7f6ba8f357052ea7d40b2525a24e3e0cab1acc4 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Thu, 16 Jul 2020 17:42:26 -0400
Subject: [PATCH] Move LoadAllAudioFiles function to the right file

---
 scanner/metadata_ffmpeg.go | 31 -------------------------------
 scanner/tag_scanner.go     | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/scanner/metadata_ffmpeg.go b/scanner/metadata_ffmpeg.go
index ade72fc4..99329f13 100644
--- a/scanner/metadata_ffmpeg.go
+++ b/scanner/metadata_ffmpeg.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -15,7 +14,6 @@ import (
 
 	"github.com/deluan/navidrome/conf"
 	"github.com/deluan/navidrome/log"
-	"github.com/deluan/navidrome/utils"
 )
 
 type Metadata struct {
@@ -51,35 +49,6 @@ func (m *Metadata) FilePath() string            { return m.filePath }
 func (m *Metadata) Suffix() string              { return m.suffix }
 func (m *Metadata) Size() int64                 { return m.fileInfo.Size() }
 
-func LoadAllAudioFiles(dirPath string) (map[string]os.FileInfo, error) {
-	dir, err := os.Open(dirPath)
-	if err != nil {
-		return nil, err
-	}
-	files, err := dir.Readdir(-1)
-	if err != nil {
-		return nil, err
-	}
-	audioFiles := make(map[string]os.FileInfo)
-	for _, f := range files {
-		if f.IsDir() {
-			continue
-		}
-		filePath := filepath.Join(dirPath, f.Name())
-		if !utils.IsAudioFile(filePath) {
-			continue
-		}
-		fi, err := os.Stat(filePath)
-		if err != nil {
-			log.Error("Could not stat file", "filePath", filePath, err)
-		} else {
-			audioFiles[filePath] = fi
-		}
-	}
-
-	return audioFiles, nil
-}
-
 func ExtractAllMetadata(inputs []string) (map[string]*Metadata, error) {
 	args := createProbeCommand(inputs)
 
diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go
index 03395649..59308168 100644
--- a/scanner/tag_scanner.go
+++ b/scanner/tag_scanner.go
@@ -442,3 +442,32 @@ func (s *TagScanner) artistID(md *Metadata) string {
 func (s *TagScanner) albumArtistID(md *Metadata) string {
 	return fmt.Sprintf("%x", md5.Sum([]byte(strings.ToLower(s.mapAlbumArtistName(md)))))
 }
+
+func LoadAllAudioFiles(dirPath string) (map[string]os.FileInfo, error) {
+	dir, err := os.Open(dirPath)
+	if err != nil {
+		return nil, err
+	}
+	files, err := dir.Readdir(-1)
+	if err != nil {
+		return nil, err
+	}
+	audioFiles := make(map[string]os.FileInfo)
+	for _, f := range files {
+		if f.IsDir() {
+			continue
+		}
+		filePath := filepath.Join(dirPath, f.Name())
+		if !utils.IsAudioFile(filePath) {
+			continue
+		}
+		fi, err := os.Stat(filePath)
+		if err != nil {
+			log.Error("Could not stat file", "filePath", filePath, err)
+		} else {
+			audioFiles[filePath] = fi
+		}
+	}
+
+	return audioFiles, nil
+}