mirror of
https://github.com/navidrome/navidrome.git
synced 2026-04-28 03:19:38 +00:00
Some checks are pending
Pipeline: Test, Lint, Build / Test Go code (push) Waiting to run
Pipeline: Test, Lint, Build / Test JS code (push) Waiting to run
Pipeline: Test, Lint, Build / Lint i18n files (push) Waiting to run
Pipeline: Test, Lint, Build / Check Docker configuration (push) Waiting to run
Pipeline: Test, Lint, Build / Build (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Get version info (push) Waiting to run
Pipeline: Test, Lint, Build / Lint Go code (push) Waiting to run
Pipeline: Test, Lint, Build / Build-1 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-2 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-3 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-4 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-5 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-6 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-7 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-8 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-9 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Push Docker manifest (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build Windows installers (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Package/Release (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Upload Linux PKG (push) Blocked by required conditions
* 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>
271 lines
7.1 KiB
Go
271 lines
7.1 KiB
Go
package tests
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
|
|
"github.com/navidrome/navidrome/model"
|
|
)
|
|
|
|
type MockDataStore struct {
|
|
RealDS model.DataStore
|
|
MockedLibrary model.LibraryRepository
|
|
MockedFolder model.FolderRepository
|
|
MockedGenre model.GenreRepository
|
|
MockedAlbum model.AlbumRepository
|
|
MockedArtist model.ArtistRepository
|
|
MockedMediaFile model.MediaFileRepository
|
|
MockedTag model.TagRepository
|
|
MockedUser model.UserRepository
|
|
MockedProperty model.PropertyRepository
|
|
MockedPlayer model.PlayerRepository
|
|
MockedPlaylist model.PlaylistRepository
|
|
MockedPlayQueue model.PlayQueueRepository
|
|
MockedShare model.ShareRepository
|
|
MockedTranscoding model.TranscodingRepository
|
|
MockedUserProps model.UserPropsRepository
|
|
MockedScrobbleBuffer model.ScrobbleBufferRepository
|
|
MockedRadio model.RadioRepository
|
|
scrobbleBufferMu sync.Mutex
|
|
repoMu sync.Mutex
|
|
|
|
// GC tracking
|
|
GCCalled bool
|
|
GCError error
|
|
}
|
|
|
|
func (db *MockDataStore) Library(ctx context.Context) model.LibraryRepository {
|
|
if db.MockedLibrary == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedLibrary = db.RealDS.Library(ctx)
|
|
} else {
|
|
db.MockedLibrary = &MockLibraryRepo{}
|
|
}
|
|
}
|
|
return db.MockedLibrary
|
|
}
|
|
|
|
func (db *MockDataStore) Folder(ctx context.Context) model.FolderRepository {
|
|
if db.MockedFolder == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedFolder = db.RealDS.Folder(ctx)
|
|
} else {
|
|
db.MockedFolder = struct{ model.FolderRepository }{}
|
|
}
|
|
}
|
|
return db.MockedFolder
|
|
}
|
|
|
|
func (db *MockDataStore) Tag(ctx context.Context) model.TagRepository {
|
|
if db.MockedTag == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedTag = db.RealDS.Tag(ctx)
|
|
} else {
|
|
db.MockedTag = struct{ model.TagRepository }{}
|
|
}
|
|
}
|
|
return db.MockedTag
|
|
}
|
|
|
|
func (db *MockDataStore) Album(ctx context.Context) model.AlbumRepository {
|
|
if db.MockedAlbum == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedAlbum = db.RealDS.Album(ctx)
|
|
} else {
|
|
db.MockedAlbum = CreateMockAlbumRepo()
|
|
}
|
|
}
|
|
return db.MockedAlbum
|
|
}
|
|
|
|
func (db *MockDataStore) Artist(ctx context.Context) model.ArtistRepository {
|
|
if db.MockedArtist == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedArtist = db.RealDS.Artist(ctx)
|
|
} else {
|
|
db.MockedArtist = CreateMockArtistRepo()
|
|
}
|
|
}
|
|
return db.MockedArtist
|
|
}
|
|
|
|
func (db *MockDataStore) MediaFile(ctx context.Context) model.MediaFileRepository {
|
|
db.repoMu.Lock()
|
|
defer db.repoMu.Unlock()
|
|
if db.MockedMediaFile == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedMediaFile = db.RealDS.MediaFile(ctx)
|
|
} else {
|
|
db.MockedMediaFile = CreateMockMediaFileRepo()
|
|
}
|
|
}
|
|
return db.MockedMediaFile
|
|
}
|
|
|
|
func (db *MockDataStore) Genre(ctx context.Context) model.GenreRepository {
|
|
if db.MockedGenre == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedGenre = db.RealDS.Genre(ctx)
|
|
} else {
|
|
db.MockedGenre = &MockedGenreRepo{}
|
|
}
|
|
}
|
|
return db.MockedGenre
|
|
}
|
|
|
|
func (db *MockDataStore) Playlist(ctx context.Context) model.PlaylistRepository {
|
|
if db.MockedPlaylist == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedPlaylist = db.RealDS.Playlist(ctx)
|
|
} else {
|
|
db.MockedPlaylist = &MockPlaylistRepo{}
|
|
}
|
|
}
|
|
return db.MockedPlaylist
|
|
}
|
|
|
|
func (db *MockDataStore) PlayQueue(ctx context.Context) model.PlayQueueRepository {
|
|
if db.MockedPlayQueue == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedPlayQueue = db.RealDS.PlayQueue(ctx)
|
|
} else {
|
|
db.MockedPlayQueue = &MockPlayQueueRepo{}
|
|
}
|
|
}
|
|
return db.MockedPlayQueue
|
|
}
|
|
|
|
func (db *MockDataStore) UserProps(ctx context.Context) model.UserPropsRepository {
|
|
if db.MockedUserProps == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedUserProps = db.RealDS.UserProps(ctx)
|
|
} else {
|
|
db.MockedUserProps = &MockedUserPropsRepo{}
|
|
}
|
|
}
|
|
return db.MockedUserProps
|
|
}
|
|
|
|
func (db *MockDataStore) Property(ctx context.Context) model.PropertyRepository {
|
|
if db.MockedProperty == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedProperty = db.RealDS.Property(ctx)
|
|
} else {
|
|
db.MockedProperty = &MockedPropertyRepo{}
|
|
}
|
|
}
|
|
return db.MockedProperty
|
|
}
|
|
|
|
func (db *MockDataStore) Share(ctx context.Context) model.ShareRepository {
|
|
if db.MockedShare == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedShare = db.RealDS.Share(ctx)
|
|
} else {
|
|
db.MockedShare = &MockShareRepo{}
|
|
}
|
|
}
|
|
return db.MockedShare
|
|
}
|
|
|
|
func (db *MockDataStore) User(ctx context.Context) model.UserRepository {
|
|
if db.MockedUser == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedUser = db.RealDS.User(ctx)
|
|
} else {
|
|
db.MockedUser = CreateMockUserRepo()
|
|
}
|
|
}
|
|
return db.MockedUser
|
|
}
|
|
|
|
func (db *MockDataStore) Transcoding(ctx context.Context) model.TranscodingRepository {
|
|
if db.MockedTranscoding == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedTranscoding = db.RealDS.Transcoding(ctx)
|
|
} else {
|
|
db.MockedTranscoding = struct{ model.TranscodingRepository }{}
|
|
}
|
|
}
|
|
return db.MockedTranscoding
|
|
}
|
|
|
|
func (db *MockDataStore) Player(ctx context.Context) model.PlayerRepository {
|
|
if db.MockedPlayer == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedPlayer = db.RealDS.Player(ctx)
|
|
} else {
|
|
db.MockedPlayer = struct{ model.PlayerRepository }{}
|
|
}
|
|
}
|
|
return db.MockedPlayer
|
|
}
|
|
|
|
func (db *MockDataStore) ScrobbleBuffer(ctx context.Context) model.ScrobbleBufferRepository {
|
|
db.scrobbleBufferMu.Lock()
|
|
defer db.scrobbleBufferMu.Unlock()
|
|
if db.MockedScrobbleBuffer == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedScrobbleBuffer = db.RealDS.ScrobbleBuffer(ctx)
|
|
} else {
|
|
db.MockedScrobbleBuffer = CreateMockedScrobbleBufferRepo()
|
|
}
|
|
}
|
|
return db.MockedScrobbleBuffer
|
|
}
|
|
|
|
func (db *MockDataStore) Radio(ctx context.Context) model.RadioRepository {
|
|
if db.MockedRadio == nil {
|
|
if db.RealDS != nil {
|
|
db.MockedRadio = db.RealDS.Radio(ctx)
|
|
} else {
|
|
db.MockedRadio = CreateMockedRadioRepo()
|
|
}
|
|
}
|
|
return db.MockedRadio
|
|
}
|
|
|
|
func (db *MockDataStore) WithTx(block func(tx model.DataStore) error, label ...string) error {
|
|
return block(db)
|
|
}
|
|
|
|
func (db *MockDataStore) WithTxImmediate(block func(tx model.DataStore) error, label ...string) error {
|
|
return block(db)
|
|
}
|
|
|
|
func (db *MockDataStore) Resource(ctx context.Context, m any) model.ResourceRepository {
|
|
switch m.(type) {
|
|
case model.MediaFile, *model.MediaFile:
|
|
return db.MediaFile(ctx).(model.ResourceRepository)
|
|
case model.Album, *model.Album:
|
|
return db.Album(ctx).(model.ResourceRepository)
|
|
case model.Artist, *model.Artist:
|
|
return db.Artist(ctx).(model.ResourceRepository)
|
|
case model.User, *model.User:
|
|
return db.User(ctx).(model.ResourceRepository)
|
|
case model.Playlist, *model.Playlist:
|
|
return db.Playlist(ctx).(model.ResourceRepository)
|
|
case model.Radio, *model.Radio:
|
|
return db.Radio(ctx).(model.ResourceRepository)
|
|
case model.Share, *model.Share:
|
|
return db.Share(ctx).(model.ResourceRepository)
|
|
case model.Genre, *model.Genre:
|
|
return db.Genre(ctx).(model.ResourceRepository)
|
|
case model.Tag, *model.Tag:
|
|
return db.Tag(ctx).(model.ResourceRepository)
|
|
case model.Transcoding, *model.Transcoding:
|
|
return db.Transcoding(ctx).(model.ResourceRepository)
|
|
case model.Player, *model.Player:
|
|
return db.Player(ctx).(model.ResourceRepository)
|
|
default:
|
|
return struct{ model.ResourceRepository }{}
|
|
}
|
|
}
|
|
|
|
func (db *MockDataStore) GC(context.Context, ...int) error {
|
|
db.GCCalled = true
|
|
if db.GCError != nil {
|
|
return db.GCError
|
|
}
|
|
return nil
|
|
}
|