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

Merge 14b664b7f9372f2a16816b63b9c0e377c954861e into dbd26ba2e71d0a5b79dba873a2beeff59f1cd8dd

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

37
core/library.go
View File

@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"io/fs"
"os"
"path/filepath"
"strconv"
"strings"
@ -359,25 +358,14 @@ func (r *libraryRepositoryWrapper) validateLibraryPath(library *model.Library) e
fsys, err := fileStore.FS()
if err != nil {
log.Warn(r.ctx, "Error validating library.path", "path", library.Path, err)
return fmt.Errorf("resources.library.validation.pathInvalid")
return errors.New(classifyLibraryPathError(err))
}
// Check if root directory exists
// Check if root directory exists and is accessible
info, err := fs.Stat(fsys, ".")
if err != nil {
// Parse the error message to check for "not a directory"
log.Warn(r.ctx, "Error stating library.path", "path", library.Path, err)
errStr := err.Error()
if strings.Contains(errStr, "not a directory") ||
strings.Contains(errStr, "The directory name is invalid.") {
return fmt.Errorf("resources.library.validation.pathNotDirectory")
} else if os.IsNotExist(err) {
return fmt.Errorf("resources.library.validation.pathNotFound")
} else if os.IsPermission(err) {
return fmt.Errorf("resources.library.validation.pathNotAccessible")
} else {
return fmt.Errorf("resources.library.validation.pathInvalid")
}
return errors.New(classifyLibraryPathError(err))
}
if !info.IsDir() {
@ -387,6 +375,25 @@ func (r *libraryRepositoryWrapper) validateLibraryPath(library *model.Library) e
return nil
}
// classifyLibraryPathError maps a filesystem error from opening or stating a
// library path to the specific i18n validation code, so the UI can show an
// actionable message instead of the generic "invalid path" catch-all. It uses
// errors.Is (not os.IsNotExist/os.IsPermission) because the storage layer wraps
// the underlying error with %w, which those helpers do not unwrap.
func classifyLibraryPathError(err error) string {
switch {
case errors.Is(err, fs.ErrNotExist):
return "resources.library.validation.pathNotFound"
case errors.Is(err, fs.ErrPermission):
return "resources.library.validation.pathNotAccessible"
case strings.Contains(err.Error(), "not a directory") ||
strings.Contains(err.Error(), "The directory name is invalid."):
return "resources.library.validation.pathNotDirectory"
default:
return "resources.library.validation.pathInvalid"
}
}
func (s *libraryService) validateLibraryIDs(ctx context.Context, libraryIDs []int) error {
if len(libraryIDs) == 0 {
return nil

4
core/library_test.go
View File

@ -335,7 +335,7 @@ var _ = Describe("Library Service", func() {
Expect(err).To(HaveOccurred())
var validationErr *rest.ValidationError
Expect(errors.As(err, &validationErr)).To(BeTrue())
Expect(validationErr.Errors["path"]).To(Equal("resources.library.validation.pathInvalid"))
Expect(validationErr.Errors["path"]).To(Equal("resources.library.validation.pathNotFound"))
})
It("fails when path is a file instead of directory", func() {
@ -415,7 +415,7 @@ var _ = Describe("Library Service", func() {
Expect(err).To(HaveOccurred())
var validationErr *rest.ValidationError
Expect(errors.As(err, &validationErr)).To(BeTrue())
Expect(validationErr.Errors["path"]).To(Equal("resources.library.validation.pathInvalid"))
Expect(validationErr.Errors["path"]).To(Equal("resources.library.validation.pathNotFound"))
})
It("fails when updated path is a file instead of directory", func() {