remote/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-12 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(playlists): import smart playlists when PlaylistsPath uses Windows separators

Browse source 
Both the relative folder path and each PlaylistsPath pattern are
converted with filepath.ToSlash before doublestar.Match. The existing
in-path example has its Windows skip removed and joins its patterns with
filepath.ListSeparator. New cases cover a path from filepath.Join, the
same folder written with forward slashes, and neighboring directories
that stay outside the configured path after normalization.

Fixes #6276

Signed-off-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
This commit is contained in:
Matt Van Horn 2026-10-06 23:01:52 -07:00
commit f8674115d2
No known key found for this signature in database
2 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

41
core/playlists/import_test.go
View file

@ -1140,16 +1140,53 @@ var _ = Describe("Playlists - Import", func() {
})
It("returns true if folder is in PlaylistsPath", func() {
tests.SkipOnWindows("path separator bug (#TBD-path-sep-playlists)")
conf.Server.PlaylistsPath = "other/**:playlists/**"
conf.Server.PlaylistsPath = strings.Join([]string{"other/**", "playlists/**"}, string(filepath.ListSeparator))
Expect(playlists.InPath(folder)).To(BeTrue())
})
It("returns true if folder matches a PlaylistsPath joined with the OS separator", func() {
nsp := model.Folder{
LibraryPath: "/music",
Path: "Playlists",
Name: "navidrome",
}
conf.Server.PlaylistsPath = filepath.Join("Playlists", "navidrome")
Expect(playlists.InPath(nsp)).To(BeTrue())
})
It("returns true if folder matches a forward-slash PlaylistsPath", func() {
nsp := model.Folder{
LibraryPath: "/music",
Path: "Playlists",
Name: "navidrome",
}
conf.Server.PlaylistsPath = "Playlists/navidrome"
Expect(playlists.InPath(nsp)).To(BeTrue())
})
It("returns false if folder is not in PlaylistsPath", func() {
conf.Server.PlaylistsPath = "other"
Expect(playlists.InPath(folder)).To(BeFalse())
})
It("returns false for a different directory after normalization", func() {
nsp := model.Folder{
LibraryPath: "/music",
Path: "Playlists",
Name: "navidrome",
}
sibling := model.Folder{
LibraryPath: "/music",
Path: "Playlists",
Name: "other",
}
conf.Server.PlaylistsPath = filepath.Join("Other", "dir")
Expect(playlists.InPath(nsp)).To(BeFalse())
conf.Server.PlaylistsPath = filepath.Join("Playlists", "navidrome", "**")
Expect(playlists.InPath(sibling)).To(BeFalse())
})
It("returns true if for a playlist in root of MusicFolder if PlaylistsPath is '.'", func() {
conf.Server.PlaylistsPath = "."
Expect(playlists.InPath(folder)).To(BeFalse())

4
core/playlists/playlists.go
View file

@ -78,8 +78,10 @@ func InPath(folder model.Folder) bool {
return true
}
rel, _ := filepath.Rel(folder.LibraryPath, folder.AbsolutePath())
// doublestar splits only on / and treats \ as an escape, so normalize OS separators first.
rel = filepath.ToSlash(rel)
for path := range strings.SplitSeq(conf.Server.PlaylistsPath, string(filepath.ListSeparator)) {
if match, _ := doublestar.Match(path, rel); match {
if match, _ := doublestar.Match(filepath.ToSlash(path), rel); match {
return true
}
}