From 464e251d19040c090abec6438fc331f3cfbe926b Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 27 Oct 2020 20:11:25 -0400 Subject: [PATCH] Only start the cache warming after all folders were scanned --- scanner/scanner.go | 1 + scanner/tag_scanner.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scanner/scanner.go b/scanner/scanner.go index f213ed288..991a4c457 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -122,6 +122,7 @@ func (s *scanner) RescanAll(fullRescan bool) { } func (s *scanner) rescanAll(fullRescan bool) { + defer s.cacheWarmer.Flush(context.Background()) var hasError bool for folder := range s.folders { err := s.rescan(folder, fullRescan) diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go index 312f52a3b..5d8448f2d 100644 --- a/scanner/tag_scanner.go +++ b/scanner/tag_scanner.go @@ -65,7 +65,6 @@ const ( // Delete all empty albums, delete all empty artists, clean-up playlists func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) error { ctx = s.withAdminUser(ctx) - defer s.cacheWarmer.Flush(ctx) start := time.Now() allFSDirs, err := s.getDirTree(ctx)