mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Process deleted folders even if there are no changed folders

This commit is contained in:
Deluan 2020-07-22 01:29:44 -04:00
parent 7a5285ae47
commit f96e2f6c4f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scanner/tag_scanner_2.go
View File

@ -63,11 +63,12 @@ func (s *TagScanner2) Scan(ctx context.Context, lastModifiedSince time.Time) err
}
changedDirs := s.getChangedDirs(ctx, allDirs, allDBDirs, lastModifiedSince)
if len(changedDirs) == 0 {
deletedDirs := s.getDeletedDirs(ctx, allDirs, allDBDirs)
if len(changedDirs)+len(deletedDirs) == 0 {
log.Debug(ctx, "No changes found in Music Folder", "folder", s.rootFolder)
return nil
}
deletedDirs, _ := s.getDeletedDirs(ctx, allDirs, allDBDirs)
if log.CurrentLevel() >= log.LevelTrace {
log.Info(ctx, "Folder changes detected", "changedFolders", len(changedDirs), "deletedFolders", len(deletedDirs),
@ -165,7 +166,7 @@ func (s *TagScanner2) getChangedDirs(ctx context.Context, dirs dirMap, dbDirs ma
return changed
}
func (s *TagScanner2) getDeletedDirs(ctx context.Context, allDirs dirMap, dbDirs map[string]struct{}) ([]string, error) {
func (s *TagScanner2) getDeletedDirs(ctx context.Context, allDirs dirMap, dbDirs map[string]struct{}) []string {
start := time.Now()
log.Trace(ctx, "Checking for deleted folders")
var deleted []string
@ -178,7 +179,7 @@ func (s *TagScanner2) getDeletedDirs(ctx context.Context, allDirs dirMap, dbDirs
sort.Strings(deleted)
log.Debug(ctx, "Finished deleted folders check", "total", len(deleted), "elapsed", time.Since(start))
return deleted, nil
return deleted
}
func (s *TagScanner2) processDeletedDir(ctx context.Context, dir string) error {