Simplify resources.FS

This commit is contained in:
Deluan 2024-05-16 22:53:51 -04:00 committed by Joe Stump
parent e34c657e42
commit 4052be2373
No known key found for this signature in database
GPG Key ID: 29151C3EC48A0EB9

View File

@ -11,19 +11,12 @@ import (
"github.com/navidrome/navidrome/utils/merge"
)
var (
//go:embed *
embedFS embed.FS
fsOnce sync.Once
fsys fs.FS
)
//go:embed *
var embedFS embed.FS
func FS() fs.FS {
fsOnce.Do(func() {
fsys = merge.FS{
Base: embedFS,
Overlay: os.DirFS(path.Join(conf.Server.DataFolder, "resources")),
}
})
return fsys
}
var FS = sync.OnceValue(func() fs.FS {
return merge.FS{
Base: embedFS,
Overlay: os.DirFS(path.Join(conf.Server.DataFolder, "resources")),
}
})