mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix(scanner): update lib.LastScanAt on each rescan (#3313)

Browse source
This commit is contained in:
Deluan Quintão 2024-09-26 06:16:27 -04:00 • committed by GitHub
parent d31952f469
commit 76614b8f16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scanner/scanner.go
View file

@ -35,7 +35,7 @@ var (
type FolderScanner interface { type FolderScanner interface {
// Scan process finds any changes after `lastModifiedSince` and returns the number of changes found // Scan process finds any changes after `lastModifiedSince` and returns the number of changes found
Scan(ctx context.Context, fullRescan bool, progress chan uint32) (int64, error) Scan(ctx context.Context, lib model.Library, fullRescan bool, progress chan uint32) (int64, error)
} }
var isScanning sync.Mutex var isScanning sync.Mutex
@ -98,7 +98,7 @@ func (s *scanner) rescan(ctx context.Context, library string, fullRescan bool) e
progress, cancel := s.startProgressTracker(library) progress, cancel := s.startProgressTracker(library)
defer cancel() defer cancel()
changeCount, err := folderScanner.Scan(ctx, fullRescan, progress) changeCount, err := folderScanner.Scan(ctx, lib, fullRescan, progress)
if err != nil { if err != nil {
log.Error("Error scanning Library", "folder", library, err) log.Error("Error scanning Library", "folder", library, err)
} }
@ -241,7 +241,7 @@ func (s *scanner) loadFolders() {
libs, _ := s.ds.Library(ctx).GetAll() libs, _ := s.ds.Library(ctx).GetAll()
for _, lib := range libs { for _, lib := range libs {
log.Info("Configuring Media Folder", "name", lib.Name, "path", lib.Path) log.Info("Configuring Media Folder", "name", lib.Name, "path", lib.Path)
s.folders[lib.Path] = s.newScanner(lib) s.folders[lib.Path] = s.newScanner()
s.libs[lib.Path] = lib s.libs[lib.Path] = lib
s.status[lib.Path] = &scanStatus{ s.status[lib.Path] = &scanStatus{
active: false, active: false,
@ -252,6 +252,6 @@ func (s *scanner) loadFolders() {
} }
} }
func (s *scanner) newScanner(f model.Library) FolderScanner { func (s *scanner) newScanner() FolderScanner {
return NewTagScanner(f, s.ds, s.pls, s.cacheWarmer) return NewTagScanner(s.ds, s.pls, s.cacheWarmer)
} }

24
scanner/tag_scanner.go
View file

@ -25,20 +25,22 @@ import (
) )
type TagScanner struct { type TagScanner struct {
lib model.Library // Dependencies
ds model.DataStore ds model.DataStore
plsSync *playlistImporter playlists core.Playlists
cnt *counters
mapper *MediaFileMapper
cacheWarmer artwork.CacheWarmer cacheWarmer artwork.CacheWarmer
// Internal state
lib model.Library
cnt *counters
mapper *MediaFileMapper
} }
func NewTagScanner(lib model.Library, ds model.DataStore, playlists core.Playlists, cacheWarmer artwork.CacheWarmer) FolderScanner { func NewTagScanner(ds model.DataStore, playlists core.Playlists, cacheWarmer artwork.CacheWarmer) FolderScanner {
s := &TagScanner{ s := &TagScanner{
lib: lib,
plsSync: newPlaylistImporter(ds, playlists, cacheWarmer, lib.Path),
ds: ds, ds: ds,
cacheWarmer: cacheWarmer, cacheWarmer: cacheWarmer,
playlists: playlists,
} }
metadata.LogExtractors() metadata.LogExtractors()
@ -77,10 +79,13 @@ const (
// - If the playlist is not in the DB, import it, setting sync = true // - If the playlist is not in the DB, import it, setting sync = true
// - If the playlist is in the DB and sync == true, import it, or else skip it // - If the playlist is in the DB and sync == true, import it, or else skip it
// Delete all empty albums, delete all empty artists, clean-up playlists // Delete all empty albums, delete all empty artists, clean-up playlists
func (s *TagScanner) Scan(ctx context.Context, fullScan bool, progress chan uint32) (int64, error) { func (s *TagScanner) Scan(ctx context.Context, lib model.Library, fullScan bool, progress chan uint32) (int64, error) {
ctx = auth.WithAdminUser(ctx, s.ds) ctx = auth.WithAdminUser(ctx, s.ds)
start := time.Now() start := time.Now()
// Update internal copy of Library
s.lib = lib
// Special case: if LastScanAt is zero, re-import all files // Special case: if LastScanAt is zero, re-import all files
fullScan = fullScan || s.lib.LastScanAt.IsZero() fullScan = fullScan || s.lib.LastScanAt.IsZero()
@ -164,7 +169,8 @@ func (s *TagScanner) Scan(ctx context.Context, fullScan bool, progress chan uint
log.Warn("Playlists will not be imported, as there are no admin users yet, "+ log.Warn("Playlists will not be imported, as there are no admin users yet, "+
"Please create an admin user first, and then update the playlists for them to be imported", "dir", dir) "Please create an admin user first, and then update the playlists for them to be imported", "dir", dir)
} else { } else {
s.cnt.playlists = s.plsSync.processPlaylists(ctx, dir) plsSync := newPlaylistImporter(s.ds, s.playlists, s.cacheWarmer, lib.Path)
s.cnt.playlists = plsSync.processPlaylists(ctx, dir)
} }
} }
} }