nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-18 07:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5edfe5736c73725baa29adf0d08a97de136cd492 into dbd26ba2e71d0a5b79dba873a2beeff59f1cd8dd

Browse Source
This commit is contained in:
Junker der Provinz 2026-08-31 07:19:20 +02:00 committed by GitHub
commit 58541b5509
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/playlists/import_test.go
View File

@ -1109,8 +1109,9 @@ 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/**"
// Build the multi-pattern list with the OS path-list separator
// (":" on Unix, ";" on Windows) so InPath splits it correctly.
conf.Server.PlaylistsPath = strings.Join([]string{"other/**", "playlists/**"}, string(filepath.ListSeparator))
Expect(playlists.InPath(folder)).To(BeTrue())
})

4
core/playlists/playlists.go
View File

@ -74,6 +74,10 @@ func InPath(folder model.Folder) bool {
return true
}
rel, _ := filepath.Rel(folder.LibraryPath, folder.AbsolutePath())
// doublestar globs always use "/" as the separator (and treat "\" as an
// escape), but filepath.Rel returns OS separators, so on Windows the
// back-slashed rel never matches a "foo/**" pattern. Normalize to slashes.
rel = filepath.ToSlash(rel)
for path := range strings.SplitSeq(conf.Server.PlaylistsPath, string(filepath.ListSeparator)) {
if match, _ := doublestar.Match(path, rel); match {
return true