third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-15 03:30:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: better scanner logging when level = info

Browse Source
This commit is contained in:
Deluan 2020-02-08 23:21:03 -05:00
parent ab10719d27
commit 400fa65326
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scanner/scanner.go
View File

@ -40,7 +40,6 @@ func (s *Scanner) Rescan(mediaFolder string, fullRescan bool) error {
} }
s.updateLastModifiedSince(mediaFolder, start) s.updateLastModifiedSince(mediaFolder, start)
log.Debug("Finished scanning folder", "folder", mediaFolder, "elapsed", time.Since(start))
return err return err
} }

14
scanner/tag_scanner.go
View File

@ -39,12 +39,14 @@ func NewTagScanner(rootFolder string, ds model.DataStore) *TagScanner {
// refresh the collected albums and artists with the metadata from the mediafiles // refresh the collected albums and artists with the metadata from the mediafiles
// Delete all empty albums, delete all empty Artists // Delete all empty albums, delete all empty Artists
func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) error { func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) error {
start := time.Now()
changed, deleted, err := s.detector.Scan(lastModifiedSince) changed, deleted, err := s.detector.Scan(lastModifiedSince)
if err != nil { if err != nil {
return err return err
} }
if len(changed)+len(deleted) == 0 { if len(changed)+len(deleted) == 0 {
log.Debug(ctx, "No changes found in Music Folder", "folder", s.rootFolder)
return nil return nil
} }
@ -108,11 +110,10 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) erro
return err return err
} }
if len(changed)+len(deleted) == 0 { err = s.ds.GC(log.NewContext(nil))
return nil log.Info("Finished Music Folder", "folder", s.rootFolder, "elapsed", time.Since(start))
}
return s.ds.GC(log.NewContext(nil)) return err
} }
func (s *TagScanner) refreshAlbums(ctx context.Context, updatedAlbums map[string]bool) error { func (s *TagScanner) refreshAlbums(ctx context.Context, updatedAlbums map[string]bool) error {
@ -133,7 +134,6 @@ 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 { func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedArtists map[string]bool, updatedAlbums map[string]bool) error {
dir = filepath.Join(s.rootFolder, dir) dir = filepath.Join(s.rootFolder, dir)
start := time.Now() start := time.Now()
// Load folder's current tracks from DB into a map // Load folder's current tracks from DB into a map
@ -185,12 +185,13 @@ func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedA
} }
} }
log.Debug("Finished processing changed folder", "dir", dir, "updated", numUpdatedTracks, "purged", numPurgedTracks, "elapsed", time.Since(start)) log.Info("Finished processing changed folder", "dir", dir, "updated", numUpdatedTracks, "purged", numPurgedTracks, "elapsed", time.Since(start))
return nil return nil
} }
func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedArtists map[string]bool, updatedAlbums map[string]bool) error { func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedArtists map[string]bool, updatedAlbums map[string]bool) error {
dir = filepath.Join(s.rootFolder, dir) dir = filepath.Join(s.rootFolder, dir)
start := time.Now()
ct, err := s.ds.MediaFile(ctx).FindByPath(dir) ct, err := s.ds.MediaFile(ctx).FindByPath(dir)
if err != nil { if err != nil {
@ -201,6 +202,7 @@ func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedA
updatedAlbums[t.AlbumID] = true updatedAlbums[t.AlbumID] = true
} }
log.Info("Finished processing deleted folder", "dir", dir, "deleted", len(ct), "elapsed", time.Since(start))
return s.ds.MediaFile(ctx).DeleteByPath(dir) return s.ds.MediaFile(ctx).DeleteByPath(dir)
} }