mirror of
https://github.com/navidrome/navidrome.git
synced 2026-08-31 07:30:32 +00:00
5a4a3099f1
* fix(scanner): accept absolute paths in selective scan --target The scanner's fs.FS only accepts paths relative to the library root, so an absolute --target path (e.g. 2:/jukebox/collection) failed with an opaque "invalid argument" error. Rebase absolute targets onto the library root before scanning; relative paths are unchanged. Fixes #5943 * refactor(scanner): simplify libraryRelativePath with IsLocal and slice.ToMap * fix(scanner): make libraryRelativePath cross-platform Windows CI failed: the tests hardcoded Unix-style absolute paths, which are not absolute on Windows, and filepath.Rel yields backslash-separated paths that the io/fs-based scanner FS rejects. Build the test paths with filepath.Abs so they are absolute on every OS, and normalize the rebased result with filepath.ToSlash. * fix(scanner): resolve relative library root before rebasing target filepath.Rel cannot rebase an absolute target onto a relative library root (e.g. the default MusicFolder=./music), so an absolute --target was left unchanged and rejected by the rooted io/fs. Make the library root absolute first; it resolves against the same cwd as the scanner's fs.
82 lines
2.1 KiB
Go
82 lines
2.1 KiB
Go
package model
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// ScanTarget represents a specific folder within a library to be scanned.
|
|
// NOTE: This struct is used as a map key, so it should only contain comparable types.
|
|
type ScanTarget struct {
|
|
LibraryID int
|
|
FolderPath string // Path within the library (relative or absolute), or "" for entire library
|
|
}
|
|
|
|
func (st ScanTarget) String() string {
|
|
return fmt.Sprintf("%d:%s", st.LibraryID, st.FolderPath)
|
|
}
|
|
|
|
// ScannerStatus holds information about the current scan status
|
|
type ScannerStatus struct {
|
|
Scanning bool
|
|
LastScan time.Time
|
|
Count uint32
|
|
FolderCount uint32
|
|
LastError string
|
|
ScanType string
|
|
ElapsedTime time.Duration
|
|
}
|
|
|
|
type Scanner interface {
|
|
// ScanAll starts a scan of all libraries. This is a blocking operation.
|
|
ScanAll(ctx context.Context, fullScan bool) (warnings []string, err error)
|
|
// ScanFolders scans specific library/folder pairs, recursing into subdirectories.
|
|
// If targets is nil, it scans all libraries. This is a blocking operation.
|
|
ScanFolders(ctx context.Context, fullScan bool, targets []ScanTarget) (warnings []string, err error)
|
|
Status(context.Context) (*ScannerStatus, error)
|
|
}
|
|
|
|
// ParseTargets parses scan targets strings into ScanTarget structs.
|
|
// Example: []string{"1:Music/Rock", "2:Classical"}
|
|
func ParseTargets(libFolders []string) ([]ScanTarget, error) {
|
|
targets := make([]ScanTarget, 0, len(libFolders))
|
|
|
|
for _, part := range libFolders {
|
|
part = strings.TrimSpace(part)
|
|
if part == "" {
|
|
continue
|
|
}
|
|
|
|
// Split by the first colon
|
|
before, after, ok := strings.Cut(part, ":")
|
|
if !ok {
|
|
return nil, fmt.Errorf("invalid target format: %q (expected libraryID:folderPath)", part)
|
|
}
|
|
|
|
libIDStr := before
|
|
folderPath := after
|
|
|
|
libID, err := strconv.Atoi(libIDStr)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid library ID %q: %w", libIDStr, err)
|
|
}
|
|
if libID <= 0 {
|
|
return nil, fmt.Errorf("invalid library ID %q", libIDStr)
|
|
}
|
|
|
|
targets = append(targets, ScanTarget{
|
|
LibraryID: libID,
|
|
FolderPath: folderPath,
|
|
})
|
|
}
|
|
|
|
if len(targets) == 0 {
|
|
return nil, fmt.Errorf("no valid targets found")
|
|
}
|
|
|
|
return targets, nil
|
|
}
|