* feat(conf): add Dir type with lazy directory creation Introduces the Dir type that wraps a directory path string and defers os.MkdirAll until the first call to Path() or MustPath(), using sync.Once to ensure the creation happens exactly once. Implements fmt.Stringer, encoding.TextMarshaler, and encoding.TextUnmarshaler for config integration. Includes Ginkgo/Gomega tests covering all methods and error paths. * refactor(conf): replace eager dir creation with lazy Dir type Change DataFolder, CacheFolder, Plugins.Folder, and Backup.Path from string to Dir. Remove all os.MkdirAll calls from Load() so directories are created lazily on first Path()/MustPath() call. Artwork folder creation was already handled at point-of-use in image_upload.go. Add SnapshotConfig() to conf package for safe test config save/restore that avoids copying sync.Once inside Dir fields. Fix copy-lock vet warning in nativeapi/config.go by marshalling pointer instead of value. * refactor(conf): migrate tests and db init to lazy Dir type Update all test files to use conf.NewDir() for Dir field assignments. Ensure DataFolder is created lazily when the database is first opened in db.Db(). Remove eager directory creation from conf.Load() tests. * fix(conf): address review findings for Dir type - Use os.ModePerm for DataFolder/CacheFolder (was 0700, should match original behavior). Add NewDirWithPerm for PluginsFolder (0700). - Use Path() instead of MustPath() in db.Prune() to avoid logFatal from background cron job. - Panic on marshal/unmarshal errors in SnapshotConfig (test helper). - Clean up redundant String()/MustPath() calls in plugin manager. - Remove dead code in dir_test.go. Signed-off-by: Deluan <deluan@navidrome.org> * fix(conf): add GoString to Dir for clean config dump output Implement fmt.GoStringer on Dir so pretty.Sprintf shows the path string instead of internal struct fields (sync.Once, perm, err). Also add TODO comment to configtest about removing the indirection. * fix(dir): improve error logging in MustPath method Signed-off-by: Deluan <deluan@navidrome.org> * refactor(tests): remove redundant tests for unwritable DataFolder and CacheFolder Signed-off-by: Deluan <deluan@navidrome.org> * fix(conf): address PR review feedback - Ensure Plugins.Folder always uses 0700, even when user-configured (previously only the derived default got restrictive permissions). - Create LogFile parent directory before opening, so LogFile paths inside a not-yet-created DataFolder work correctly. --------- Signed-off-by: Deluan <deluan@navidrome.org>
76 lines
1.9 KiB
Go
76 lines
1.9 KiB
Go
package conf
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"sync"
|
|
)
|
|
|
|
// Dir wraps a directory path and lazily creates the directory on first use.
|
|
// The directory is created at most once; if creation fails, the error is
|
|
// permanently cached (sync.Once semantics). Dir is not safe for mutation
|
|
// after Path() has been called.
|
|
type Dir struct {
|
|
path string
|
|
perm os.FileMode
|
|
once sync.Once
|
|
err error
|
|
}
|
|
|
|
// NewDir creates a new Dir with the given path and default permissions (os.ModePerm).
|
|
func NewDir(path string) Dir {
|
|
return Dir{path: path, perm: os.ModePerm}
|
|
}
|
|
|
|
// NewDirWithPerm creates a new Dir with the given path and permissions.
|
|
func NewDirWithPerm(path string, perm os.FileMode) Dir {
|
|
return Dir{path: path, perm: perm}
|
|
}
|
|
|
|
// String returns the raw path without creating the directory. Satisfies fmt.Stringer.
|
|
func (d *Dir) String() string {
|
|
return d.path
|
|
}
|
|
|
|
// Path creates the directory on first call (via sync.Once) and returns the path.
|
|
func (d *Dir) Path() (string, error) {
|
|
d.once.Do(func() {
|
|
if d.path == "" {
|
|
return
|
|
}
|
|
d.err = os.MkdirAll(d.path, d.perm)
|
|
if d.err != nil {
|
|
d.err = fmt.Errorf("creating directory %q: %w", d.path, d.err)
|
|
}
|
|
})
|
|
return d.path, d.err
|
|
}
|
|
|
|
// MustPath calls Path() and calls logFatal on error.
|
|
func (d *Dir) MustPath() string {
|
|
path, err := d.Path()
|
|
if err != nil {
|
|
logFatal("creating directory:", err)
|
|
}
|
|
return path
|
|
}
|
|
|
|
// GoString implements fmt.GoStringer so that %#v (used by pretty.Sprintf)
|
|
// prints the path string instead of the internal struct fields.
|
|
func (d Dir) GoString() string { //nolint:govet
|
|
return fmt.Sprintf("%q", d.path)
|
|
}
|
|
|
|
// MarshalText returns the raw path bytes. No side effects.
|
|
func (d *Dir) MarshalText() ([]byte, error) {
|
|
return []byte(d.path), nil
|
|
}
|
|
|
|
// UnmarshalText sets the path from bytes. No side effects.
|
|
func (d *Dir) UnmarshalText(text []byte) error {
|
|
d.path = string(text)
|
|
if d.perm == 0 {
|
|
d.perm = os.ModePerm
|
|
}
|
|
return nil
|
|
}
|