mirror of
https://github.com/navidrome/navidrome.git
synced 2025-12-23 23:18:05 -05:00
* feat: Add selective folder scanning capability Implement targeted scanning of specific library/folder pairs without full recursion. This enables efficient rescanning of individual folders when changes are detected, significantly reducing scan time for large libraries. Key changes: - Add ScanTarget struct and ScanFolders API to Scanner interface - Implement CLI flag --targets for specifying libraryID:folderPath pairs - Add FolderRepository.GetByPaths() for batch folder info retrieval - Create loadSpecificFolders() for non-recursive directory loading - Scope GC operations to affected libraries only (with TODO for full impl) - Add comprehensive tests for selective scanning behavior The selective scan: - Only processes specified folders (no subdirectory recursion) - Maintains library isolation - Runs full maintenance pipeline scoped to affected libraries - Supports both full and quick scan modes Examples: navidrome scan --targets "1:Music/Rock,1:Music/Jazz" navidrome scan --full --targets "2:Classical" * feat(folder): replace GetByPaths with GetFolderUpdateInfo for improved folder updates retrieval Signed-off-by: Deluan <deluan@navidrome.org> * test: update parseTargets test to handle folder names with spaces Signed-off-by: Deluan <deluan@navidrome.org> * refactor(folder): remove unused LibraryPath struct and update GC logging message Signed-off-by: Deluan <deluan@navidrome.org> * refactor(folder): enhance external scanner to support target-specific scanning Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): simplify scanner methods Signed-off-by: Deluan <deluan@navidrome.org> * feat(watcher): implement folder scanning notifications with deduplication Signed-off-by: Deluan <deluan@navidrome.org> * refactor(watcher): add resolveFolderPath function for testability Signed-off-by: Deluan <deluan@navidrome.org> * feat(watcher): implement path ignoring based on .ndignore patterns Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): implement IgnoreChecker for managing .ndignore patterns Signed-off-by: Deluan <deluan@navidrome.org> * refactor(ignore_checker): rename scanner to lineScanner for clarity Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): enhance ScanTarget struct with String method for better target representation Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): validate library ID to prevent negative values Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): simplify GC method by removing library ID parameter Signed-off-by: Deluan <deluan@navidrome.org> * feat(scanner): update folder scanning to include all descendants of specified folders Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): allow selective scan in the /startScan endpoint Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): update CallScan to handle specific library/folder pairs Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): streamline scanning logic by removing scanAll method Signed-off-by: Deluan <deluan@navidrome.org> * test: enhance mockScanner for thread safety and improve test reliability Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): move scanner.ScanTarget to model.ScanTarget Signed-off-by: Deluan <deluan@navidrome.org> * refactor: move scanner types to model,implement MockScanner Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): update scanner interface and implementations to use model.Scanner Signed-off-by: Deluan <deluan@navidrome.org> * refactor(folder_repository): normalize target path handling by using filepath.Clean Signed-off-by: Deluan <deluan@navidrome.org> * test(folder_repository): add comprehensive tests for folder retrieval and child exclusion Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): simplify selective scan logic using slice.Filter Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): streamline phase folder and album creation by removing unnecessary library parameter Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): move initialization logic from phase_1 to the scanner itself Signed-off-by: Deluan <deluan@navidrome.org> * refactor(tests): rename selective scan test file to scanner_selective_test.go Signed-off-by: Deluan <deluan@navidrome.org> * feat(configuration): add DevSelectiveWatcher configuration option Signed-off-by: Deluan <deluan@navidrome.org> * feat(watcher): enhance .ndignore handling for folder deletions and file changes Signed-off-by: Deluan <deluan@navidrome.org> * docs(scanner): comments Signed-off-by: Deluan <deluan@navidrome.org> * refactor(scanner): enhance walkDirTree to support target folder scanning Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner, watcher): handle errors when pushing ignore patterns for folders Signed-off-by: Deluan <deluan@navidrome.org> * Update scanner/phase_1_folders.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * refactor(scanner): replace parseTargets function with direct call to scanner.ParseTargets Signed-off-by: Deluan <deluan@navidrome.org> * test(scanner): add tests for ScanBegin and ScanEnd functionality Signed-off-by: Deluan <deluan@navidrome.org> * fix(library): update PRAGMA optimize to check table sizes without ANALYZE Signed-off-by: Deluan <deluan@navidrome.org> * test(scanner): refactor tests Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): add selective scan options and update translations Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): add quick and full scan options for individual libraries Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): add Scan buttonsto the LibraryList Signed-off-by: Deluan <deluan@navidrome.org> * feat(scan): update scanning parameters from 'path' to 'target' for selective scans. * refactor(scan): move ParseTargets function to model package * test(scan): suppress unused return value from SetUserLibraries in tests * feat(gc): enhance garbage collection to support selective library purging Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): prevent race condition when scanning deleted folders When the watcher detects changes in a folder that gets deleted before the scanner runs (due to the 10-second delay), the scanner was prematurely removing these folders from the tracking map, preventing them from being marked as missing. The issue occurred because `newFolderEntry` was calling `popLastUpdate` before verifying the folder actually exists on the filesystem. Changes: - Move fs.Stat check before newFolderEntry creation in loadDir to ensure deleted folders remain in lastUpdates for finalize() to handle - Add early existence check in walkDirTree to skip non-existent target folders with a warning log - Add unit test verifying non-existent folders aren't removed from lastUpdates prematurely - Add integration test for deleted folder scenario with ScanFolders Fixes the issue where deleting entire folders (e.g., /music/AC_DC) wouldn't mark tracks as missing when using selective folder scanning. * refactor(scan): streamline folder entry creation and update handling Signed-off-by: Deluan <deluan@navidrome.org> * feat(scan): add '@Recycle' (QNAP) to ignored directories list Signed-off-by: Deluan <deluan@navidrome.org> * fix(log): improve thread safety in logging level management * test(scan): move unit tests for ParseTargets function Signed-off-by: Deluan <deluan@navidrome.org> * review Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: deluan <deluan.quintao@mechanical-orchard.com>
149 lines
4.8 KiB
Go
149 lines
4.8 KiB
Go
// nolint:unused
|
|
package scanner
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/Masterminds/squirrel"
|
|
ppl "github.com/google/go-pipeline/pkg/pipeline"
|
|
"github.com/navidrome/navidrome/log"
|
|
"github.com/navidrome/navidrome/model"
|
|
)
|
|
|
|
// phaseRefreshAlbums is responsible for refreshing albums that have been
|
|
// newly added or changed during the scan process. This phase ensures that
|
|
// the album information in the database is up-to-date by performing the
|
|
// following steps:
|
|
// 1. Loads all libraries and their albums that have been touched (new or changed).
|
|
// 2. For each album, it filters out unmodified albums by comparing the current
|
|
// state with the state in the database.
|
|
// 3. Refreshes the album information in the database if any changes are detected.
|
|
// 4. Logs the results and finalizes the phase by reporting the total number of
|
|
// refreshed and skipped albums.
|
|
// 5. As a last step, it refreshes the artist statistics to reflect the changes
|
|
type phaseRefreshAlbums struct {
|
|
ds model.DataStore
|
|
ctx context.Context
|
|
refreshed atomic.Uint32
|
|
skipped atomic.Uint32
|
|
state *scanState
|
|
}
|
|
|
|
func createPhaseRefreshAlbums(ctx context.Context, state *scanState, ds model.DataStore) *phaseRefreshAlbums {
|
|
return &phaseRefreshAlbums{ctx: ctx, ds: ds, state: state}
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) description() string {
|
|
return "Refresh all new/changed albums"
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) producer() ppl.Producer[*model.Album] {
|
|
return ppl.NewProducer(p.produce, ppl.Name("load albums from db"))
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) produce(put func(album *model.Album)) error {
|
|
count := 0
|
|
for _, lib := range p.state.libraries {
|
|
cursor, err := p.ds.Album(p.ctx).GetTouchedAlbums(lib.ID)
|
|
if err != nil {
|
|
return fmt.Errorf("loading touched albums: %w", err)
|
|
}
|
|
log.Debug(p.ctx, "Scanner: Checking albums that may need refresh", "libraryId", lib.ID, "libraryName", lib.Name)
|
|
for album, err := range cursor {
|
|
if err != nil {
|
|
return fmt.Errorf("loading touched albums: %w", err)
|
|
}
|
|
count++
|
|
put(&album)
|
|
}
|
|
}
|
|
if count == 0 {
|
|
log.Debug(p.ctx, "Scanner: No albums needing refresh")
|
|
} else {
|
|
log.Debug(p.ctx, "Scanner: Found albums that may need refreshing", "count", count)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) stages() []ppl.Stage[*model.Album] {
|
|
return []ppl.Stage[*model.Album]{
|
|
ppl.NewStage(p.filterUnmodified, ppl.Name("filter unmodified"), ppl.Concurrency(5)),
|
|
ppl.NewStage(p.refreshAlbum, ppl.Name("refresh albums")),
|
|
}
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) filterUnmodified(album *model.Album) (*model.Album, error) {
|
|
mfs, err := p.ds.MediaFile(p.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": album.ID}})
|
|
if err != nil {
|
|
log.Error(p.ctx, "Error loading media files for album", "album_id", album.ID, err)
|
|
return nil, err
|
|
}
|
|
if len(mfs) == 0 {
|
|
log.Debug(p.ctx, "Scanner: album has no media files. Skipping", "album_id", album.ID,
|
|
"name", album.Name, "songCount", album.SongCount, "updatedAt", album.UpdatedAt)
|
|
p.skipped.Add(1)
|
|
return nil, nil
|
|
}
|
|
|
|
newAlbum := mfs.ToAlbum()
|
|
if album.Equals(newAlbum) {
|
|
log.Trace("Scanner: album is up to date. Skipping", "album_id", album.ID,
|
|
"name", album.Name, "songCount", album.SongCount, "updatedAt", album.UpdatedAt)
|
|
p.skipped.Add(1)
|
|
return nil, nil
|
|
}
|
|
return &newAlbum, nil
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) refreshAlbum(album *model.Album) (*model.Album, error) {
|
|
if album == nil {
|
|
return nil, nil
|
|
}
|
|
start := time.Now()
|
|
err := p.ds.Album(p.ctx).Put(album)
|
|
log.Debug(p.ctx, "Scanner: refreshing album", "album_id", album.ID, "name", album.Name, "songCount", album.SongCount, "elapsed", time.Since(start), err)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("refreshing album %s: %w", album.ID, err)
|
|
}
|
|
p.refreshed.Add(1)
|
|
p.state.changesDetected.Store(true)
|
|
return album, nil
|
|
}
|
|
|
|
func (p *phaseRefreshAlbums) finalize(err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
logF := log.Info
|
|
refreshed := p.refreshed.Load()
|
|
skipped := p.skipped.Load()
|
|
if refreshed == 0 {
|
|
logF = log.Debug
|
|
}
|
|
logF(p.ctx, "Scanner: Finished refreshing albums", "refreshed", refreshed, "skipped", skipped, err)
|
|
if !p.state.changesDetected.Load() {
|
|
log.Debug(p.ctx, "Scanner: No changes detected, skipping refreshing annotations")
|
|
return nil
|
|
}
|
|
// Refresh album annotations
|
|
start := time.Now()
|
|
cnt, err := p.ds.Album(p.ctx).RefreshPlayCounts()
|
|
if err != nil {
|
|
return fmt.Errorf("refreshing album annotations: %w", err)
|
|
}
|
|
log.Debug(p.ctx, "Scanner: Refreshed album annotations", "albums", cnt, "elapsed", time.Since(start))
|
|
|
|
// Refresh artist annotations
|
|
start = time.Now()
|
|
cnt, err = p.ds.Artist(p.ctx).RefreshPlayCounts()
|
|
if err != nil {
|
|
return fmt.Errorf("refreshing artist annotations: %w", err)
|
|
}
|
|
log.Debug(p.ctx, "Scanner: Refreshed artist annotations", "artists", cnt, "elapsed", time.Since(start))
|
|
p.state.changesDetected.Store(true)
|
|
return nil
|
|
}
|