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

Re-apply "Refactor walkDirTree to use fs.FS" but remove context cancelation logic.

Browse Source 
This reverts commit 6b3b4d83ff.
This commit is contained in:
Deluan
2023-06-04 15:05:20 -04:00
parent 6b3b4d83ff
commit d6083dab6e
5 changed files with 90 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/tag_scanner.go
+7 -20
View File
@@ -80,9 +80,10 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time, prog
// Special case: if lastModifiedSince is zero, re-import all files
fullScan := lastModifiedSince.IsZero()
rootFS := os.DirFS(s.rootFolder)
// If the media folder is empty (no music and no subfolders), abort to avoid deleting all data from DB
empty, err := isDirEmpty(ctx, s.rootFolder)
empty, err := isDirEmpty(ctx, rootFS, ".")
if err != nil {
return 0, err
}
@@ -103,7 +104,9 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time, prog
s.mapper = newMediaFileMapper(s.rootFolder, genres)
refresher := newRefresher(s.ds, s.cacheWarmer, allFSDirs)
foldersFound, walkerError := s.getRootFolderWalker(ctx)
log.Trace(ctx, "Loading directory tree from music folder", "folder", s.rootFolder)
foldersFound, walkerError := walkDirTree(ctx, rootFS, s.rootFolder)
for {
folderStats, more := <-foldersFound
if !more {
@@ -166,30 +169,14 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time, prog
return s.cnt.total(), err
}
func isDirEmpty(ctx context.Context, dir string) (bool, error) {
children, stats, err := loadDir(ctx, dir)
func isDirEmpty(ctx context.Context, rootFS fs.FS, dir string) (bool, error) {
children, stats, err := loadDir(ctx, rootFS, dir)
if err != nil {
return false, err
}
return len(children) == 0 && stats.AudioFilesCount == 0, nil
}
func (s *TagScanner) getRootFolderWalker(ctx context.Context) (walkResults, chan error) {
start := time.Now()
log.Trace(ctx, "Loading directory tree from music folder", "folder", s.rootFolder)
results := make(chan dirStats, 5000)
walkerError := make(chan error)
go func() {
err := walkDirTree(ctx, s.rootFolder, results)
if err != nil {
log.Error("There were errors reading directories from filesystem", err)
}
walkerError <- err
log.Debug("Finished reading directories from filesystem", "elapsed", time.Since(start))
}()
return results, walkerError
}
func (s *TagScanner) getDBDirTree(ctx context.Context) (map[string]struct{}, error) {
start := time.Now()
log.Trace(ctx, "Loading directory tree from database", "folder", s.rootFolder)