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

Remove dangling tracks after changing MusicFolder. Fix #445

Browse source
This commit is contained in:
Deluan 2020-10-02 16:18:45 -04:00
parent 1be79fa945
commit f859772723
5 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
model/datastore.go
View file

@ -35,5 +35,5 @@ type DataStore interface {
Resource(ctx context.Context, model interface{}) ResourceRepository
WithTx(func(tx DataStore) error) error
GC(ctx context.Context) error
GC(ctx context.Context, rootFolder string) error
}

13
persistence/mediafile_repository.go
View file

@ -108,7 +108,7 @@ func (r mediaFileRepository) FindAllByPath(path string) (model.MediaFiles, error
return res, err
}
func pathStartsWith(path string) Sqlizer {
func pathStartsWith(path string) Eq {
cleanPath := filepath.Clean(path)
substr := fmt.Sprintf("substr(path, 1, %d)", utf8.RuneCountInString(cleanPath))
return Eq{substr: cleanPath}
@ -124,6 +124,17 @@ func (r mediaFileRepository) FindPathsRecursively(basePath string) ([]string, er
return res, err
}
func (r mediaFileRepository) deleteNotInPath(basePath string) error {
sel := Delete(r.tableName).Where(NotEq(pathStartsWith(basePath)))
c, err := r.executeSQL(sel)
if err == nil {
if c > 0 {
log.Debug(r.ctx, "Deleted dangling tracks", "totalDeleted", c)
}
}
return err
}
func (r mediaFileRepository) GetStarred(options ...model.QueryOptions) (model.MediaFiles, error) {
sq := r.selectMediaFile(options...).Where("starred = true")
starred := model.MediaFiles{}

2
persistence/mock_persistence.go
View file

@ -89,7 +89,7 @@ func (db *MockDataStore) Resource(ctx context.Context, m interface{}) model.Reso
return struct{ model.ResourceRepository }{}
}
func (db *MockDataStore) GC(ctx context.Context) error {
func (db *MockDataStore) GC(ctx context.Context, rootFolder string) error {
return nil
}

9
persistence/persistence.go
View file

@ -111,8 +111,13 @@ func (s *SQLStore) WithTx(block func(tx model.DataStore) error) error {
return nil
}
func (s *SQLStore) GC(ctx context.Context) error {
err := s.Album(ctx).(*albumRepository).purgeEmpty()
func (s *SQLStore) GC(ctx context.Context, rootFolder string) error {
err := s.MediaFile(ctx).(*mediaFileRepository).deleteNotInPath(rootFolder)
if err != nil {
log.Error(ctx, "Error removing dangling tracks", err)
return err
}
err = s.Album(ctx).(*albumRepository).purgeEmpty()
if err != nil {
log.Error(ctx, "Error removing empty albums", err)
return err

14
scanner/tag_scanner.go
View file

@ -33,13 +33,11 @@ func NewTagScanner(rootFolder string, ds model.DataStore) *TagScanner {
}
}
type (
counters struct {
added int64
updated int64
deleted int64
}
)
type counters struct {
added int64
updated int64
deleted int64
}
const (
// filesBatchSize used for batching file metadata extraction
@ -125,7 +123,7 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) erro
log.Debug("Playlist auto-import is disabled")
}
err = s.ds.GC(log.NewContext(ctx))
err = s.ds.GC(log.NewContext(ctx), s.rootFolder)
log.Info("Finished processing Music Folder", "folder", s.rootFolder, "elapsed", time.Since(start),
"added", s.cnt.added, "updated", s.cnt.updated, "deleted", s.cnt.deleted, "playlistsImported", plsCount)