mirror of
https://github.com/navidrome/navidrome.git
synced 2026-08-31 07:30:32 +00:00
* 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.
138 lines
3.7 KiB
Go
138 lines
3.7 KiB
Go
// nolint unused
|
|
package scanner
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"os"
|
|
"path/filepath"
|
|
"sync/atomic"
|
|
|
|
ppl "github.com/google/go-pipeline/pkg/pipeline"
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
var _ = Describe("libraryRelativePath", func() {
|
|
// Paths are built with filepath so the "absolute" cases stay absolute on every OS
|
|
// (a Unix-style "/foo" is not absolute on Windows).
|
|
libRoot, _ := filepath.Abs(filepath.Join("jukebox", "collection"))
|
|
outside, _ := filepath.Abs(filepath.Join("somewhere", "else"))
|
|
|
|
It("returns a relative path unchanged", func() {
|
|
Expect(libraryRelativePath(libRoot, "_Collection")).To(Equal("_Collection"))
|
|
})
|
|
|
|
It("rebases an absolute target when the library root is relative", func() {
|
|
cwd, err := os.Getwd()
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(libraryRelativePath(filepath.Join("music", "library"), filepath.Join(cwd, "music", "library", "rock"))).To(Equal("rock"))
|
|
})
|
|
|
|
It("rebases an absolute path that equals the library root to '.'", func() {
|
|
Expect(libraryRelativePath(libRoot, libRoot)).To(Equal("."))
|
|
})
|
|
|
|
It("rebases an absolute path under the library root", func() {
|
|
Expect(libraryRelativePath(libRoot, filepath.Join(libRoot, "_Collection"))).To(Equal("_Collection"))
|
|
})
|
|
|
|
It("handles a trailing slash on the library path", func() {
|
|
Expect(libraryRelativePath(libRoot+string(filepath.Separator), filepath.Join(libRoot, "_Collection"))).To(Equal("_Collection"))
|
|
})
|
|
|
|
It("leaves an absolute path outside the library root unchanged", func() {
|
|
Expect(libraryRelativePath(libRoot, outside)).To(Equal(outside))
|
|
})
|
|
|
|
It("returns an empty path unchanged", func() {
|
|
Expect(libraryRelativePath(libRoot, "")).To(Equal(""))
|
|
})
|
|
})
|
|
|
|
type mockPhase struct {
|
|
num int
|
|
produceFunc func() ppl.Producer[int]
|
|
stagesFunc func() []ppl.Stage[int]
|
|
finalizeFunc func(error) error
|
|
descriptionFn func() string
|
|
}
|
|
|
|
func (m *mockPhase) producer() ppl.Producer[int] {
|
|
return m.produceFunc()
|
|
}
|
|
|
|
func (m *mockPhase) stages() []ppl.Stage[int] {
|
|
return m.stagesFunc()
|
|
}
|
|
|
|
func (m *mockPhase) finalize(err error) error {
|
|
return m.finalizeFunc(err)
|
|
}
|
|
|
|
func (m *mockPhase) description() string {
|
|
return m.descriptionFn()
|
|
}
|
|
|
|
var _ = Describe("runPhase", func() {
|
|
var (
|
|
ctx context.Context
|
|
phaseNum int
|
|
phase *mockPhase
|
|
sum atomic.Int32
|
|
)
|
|
|
|
BeforeEach(func() {
|
|
ctx = context.Background()
|
|
phaseNum = 1
|
|
phase = &mockPhase{
|
|
num: 3,
|
|
produceFunc: func() ppl.Producer[int] {
|
|
return ppl.NewProducer(func(put func(int)) error {
|
|
for i := 1; i <= phase.num; i++ {
|
|
put(i)
|
|
}
|
|
return nil
|
|
})
|
|
},
|
|
stagesFunc: func() []ppl.Stage[int] {
|
|
return []ppl.Stage[int]{ppl.NewStage(func(i int) (int, error) {
|
|
sum.Add(int32(i))
|
|
return i, nil
|
|
})}
|
|
},
|
|
finalizeFunc: func(err error) error {
|
|
return err
|
|
},
|
|
descriptionFn: func() string {
|
|
return "Mock Phase"
|
|
},
|
|
}
|
|
})
|
|
|
|
It("should run the phase successfully", func() {
|
|
err := runPhase(ctx, phaseNum, phase)()
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(sum.Load()).To(Equal(int32(1 * 2 * 3)))
|
|
})
|
|
|
|
It("should log an error if the phase fails", func() {
|
|
phase.finalizeFunc = func(err error) error {
|
|
return errors.New("finalize error")
|
|
}
|
|
err := runPhase(ctx, phaseNum, phase)()
|
|
Expect(err).To(HaveOccurred())
|
|
Expect(err.Error()).To(ContainSubstring("finalize error"))
|
|
})
|
|
|
|
It("should count the tasks", func() {
|
|
counter, countStageFn := countTasks[int]()
|
|
phase.stagesFunc = func() []ppl.Stage[int] {
|
|
return []ppl.Stage[int]{ppl.NewStage(countStageFn, ppl.Name("count tasks"))}
|
|
}
|
|
err := runPhase(ctx, phaseNum, phase)()
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(counter.Load()).To(Equal(int64(3)))
|
|
})
|
|
})
|