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

fix: use filepath.Join instead of path.Join

Browse Source
This commit is contained in:
Deluan
2020-02-02 20:12:46 -05:00
committed by Deluan Quintão
parent d9eb3e58cd
commit 0e01f9a0f9
6 changed files with 83 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/tag_scanner.go
+7 -4
View File
@@ -5,7 +5,6 @@ import (
"crypto/md5"
"fmt"
"os"
"path"
"path/filepath"
"sort"
"strings"
@@ -49,7 +48,11 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) erro
return nil
}
log.Info("Folder changes found", "changed", len(changed), "deleted", len(deleted))
if log.CurrentLevel() >= log.LevelTrace {
log.Info(ctx, "Folder changes found", "numChanged", len(changed), "numDeleted", len(deleted), "changed", changed, "deleted", deleted)
} else {
log.Info(ctx, "Folder changes found", "numChanged", len(changed), "numDeleted", len(deleted))
}
sort.Strings(changed)
sort.Strings(deleted)
@@ -128,7 +131,7 @@ func (s *TagScanner) refreshArtists(ctx context.Context, updatedArtists map[stri
}
func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedArtists map[string]bool, updatedAlbums map[string]bool) error {
dir = path.Join(s.rootFolder, dir)
dir = filepath.Join(s.rootFolder, dir)
start := time.Now()
@@ -186,7 +189,7 @@ func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedA
}
func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedArtists map[string]bool, updatedAlbums map[string]bool) error {
dir = path.Join(s.rootFolder, dir)
dir = filepath.Join(s.rootFolder, dir)
ct, err := s.ds.MediaFile(ctx).FindByPath(dir)
if err != nil {