third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-06-06 10:23:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Show totals at the end of scan

Browse Source
This commit is contained in:
Deluan 2020-07-12 12:35:23 -04:00
parent f694e471fb
commit c2f40ea8a3
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scanner/tag_scanner.go
View File

@ -37,6 +37,12 @@ func NewTagScanner(rootFolder string, ds model.DataStore) *TagScanner {
type ( type (
artistMap map[string]struct{} artistMap map[string]struct{}
albumMap map[string]struct{} albumMap map[string]struct{}
counters struct {
added int64
updated int64
deleted int64
}
) )
const ( const (
@ -83,15 +89,16 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) erro
updatedArtists := artistMap{} updatedArtists := artistMap{}
updatedAlbums := albumMap{} updatedAlbums := albumMap{}
cnt := &counters{}
for _, c := range changed { for _, c := range changed {
err := s.processChangedDir(ctx, c, updatedArtists, updatedAlbums) err := s.processChangedDir(ctx, c, updatedArtists, updatedAlbums, cnt)
if err != nil { if err != nil {
return err return err
} }
} }
for _, c := range deleted { for _, c := range deleted {
err := s.processDeletedDir(ctx, c, updatedArtists, updatedAlbums) err := s.processDeletedDir(ctx, c, updatedArtists, updatedAlbums, cnt)
if err != nil { if err != nil {
return err return err
} }
@ -108,11 +115,12 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) erro
} }
s.firstRun.Do(func() { s.firstRun.Do(func() {
s.removeDeletedFolders(context.TODO(), changed) s.removeDeletedFolders(context.TODO(), changed, cnt)
}) })
err = s.ds.GC(log.NewContext(context.TODO())) err = s.ds.GC(log.NewContext(context.TODO()))
log.Info("Finished Music Folder", "folder", s.rootFolder, "elapsed", time.Since(start)) log.Info("Finished Music Folder", "folder", s.rootFolder, "elapsed", time.Since(start),
"added", cnt.added, "updated", cnt.updated, "deleted", cnt.deleted)
return err return err
} }
@ -141,7 +149,7 @@ func (s *TagScanner) flushArtists(ctx context.Context, updatedArtists artistMap)
return s.ds.Artist(ctx).Refresh(ids...) return s.ds.Artist(ctx).Refresh(ids...)
} }
func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedArtists artistMap, updatedAlbums albumMap) error { func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedArtists artistMap, updatedAlbums albumMap, cnt *counters) error {
dir = filepath.Join(s.rootFolder, dir) dir = filepath.Join(s.rootFolder, dir)
start := time.Now() start := time.Now()
@ -171,8 +179,13 @@ func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedA
var filesToUpdate []string var filesToUpdate []string
for filePath, info := range files { for filePath, info := range files {
c, ok := currentTracks[filePath] c, ok := currentTracks[filePath]
if !ok || (ok && info.ModTime().After(c.UpdatedAt)) { if !ok {
filesToUpdate = append(filesToUpdate, filePath) filesToUpdate = append(filesToUpdate, filePath)
cnt.added++
}
if ok && info.ModTime().After(c.UpdatedAt) {
filesToUpdate = append(filesToUpdate, filePath)
cnt.updated++
} }
delete(currentTracks, filePath) delete(currentTracks, filePath)
@ -238,6 +251,7 @@ func (s *TagScanner) processChangedDir(ctx context.Context, dir string, updatedA
if err := s.ds.MediaFile(ctx).Delete(ct.ID); err != nil { if err := s.ds.MediaFile(ctx).Delete(ct.ID); err != nil {
return err return err
} }
cnt.deleted++
} }
} }
@ -267,15 +281,15 @@ func (s *TagScanner) updateArtist(ctx context.Context, artistId string, updatedA
return nil return nil
} }
func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedArtists artistMap, updatedAlbums albumMap) error { func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedArtists artistMap, updatedAlbums albumMap, cnt *counters) error {
dir = filepath.Join(s.rootFolder, dir) dir = filepath.Join(s.rootFolder, dir)
start := time.Now() start := time.Now()
ct, err := s.ds.MediaFile(ctx).FindByPath(dir) mfs, err := s.ds.MediaFile(ctx).FindByPath(dir)
if err != nil { if err != nil {
return err return err
} }
for _, t := range ct { for _, t := range mfs {
err = s.updateAlbum(ctx, t.AlbumID, updatedAlbums) err = s.updateAlbum(ctx, t.AlbumID, updatedAlbums)
if err != nil { if err != nil {
return err return err
@ -286,12 +300,13 @@ func (s *TagScanner) processDeletedDir(ctx context.Context, dir string, updatedA
} }
} }
log.Info("Finished processing deleted folder", "dir", dir, "purged", len(ct), "elapsed", time.Since(start)) log.Info("Finished processing deleted folder", "dir", dir, "purged", len(mfs), "elapsed", time.Since(start))
_, err = s.ds.MediaFile(ctx).DeleteByPath(dir) c, err := s.ds.MediaFile(ctx).DeleteByPath(dir)
cnt.deleted += c
return err return err
} }
func (s *TagScanner) removeDeletedFolders(ctx context.Context, changed []string) { func (s *TagScanner) removeDeletedFolders(ctx context.Context, changed []string, cnt *counters) {
for _, dir := range changed { for _, dir := range changed {
fullPath := filepath.Join(s.rootFolder, dir) fullPath := filepath.Join(s.rootFolder, dir)
paths, err := s.ds.MediaFile(ctx).FindPathsRecursively(fullPath) paths, err := s.ds.MediaFile(ctx).FindPathsRecursively(fullPath)
@ -304,10 +319,11 @@ func (s *TagScanner) removeDeletedFolders(ctx context.Context, changed []string)
for _, path := range paths { for _, path := range paths {
if readable, err := utils.IsDirReadable(path); !readable { if readable, err := utils.IsDirReadable(path); !readable {
log.Info(ctx, "Path unavailable. Removing tracks from DB", "path", path, err) log.Info(ctx, "Path unavailable. Removing tracks from DB", "path", path, err)
_, err = s.ds.MediaFile(ctx).DeleteByPath(path) c, err := s.ds.MediaFile(ctx).DeleteByPath(path)
if err != nil { if err != nil {
log.Error(ctx, "Error removing MediaFiles from DB", "path", path, err) log.Error(ctx, "Error removing MediaFiles from DB", "path", path, err)
} }
cnt.deleted += c
} }
} }
} }