mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2025-07-01 08:08:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: remove yaml config option

Browse source
This commit is contained in:
Hayden 2022-10-12 13:03:42 -08:00 • committed by GitHub
parent 92368dabf8
commit 14f1b93d38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/internal/config/conf.go
View file

@ -6,7 +6,6 @@ import (
"fmt"
"github.com/ardanlabs/conf/v2"
"github.com/ardanlabs/conf/v2/yaml"
"os"
)
@ -37,24 +36,13 @@ type WebConfig struct {
MaxUploadSize int64 `yaml:"max_file_upload" conf:"default:10"`
}
// NewConfig parses the CLI/Config file and returns a Config struct. If the file argument is an empty string, the
// New parses the CLI/Config file and returns a Config struct. If the file argument is an empty string, the
// file is not read. If the file is not empty, the file is read and the Config struct is returned.
func NewConfig(file string) (*Config, error) {
func New() (*Config, error) {
var cfg Config
const prefix = "HBOX"
help, err := func() (string, error) {
if _, err := os.Stat(file); errors.Is(err, os.ErrNotExist) {
return conf.Parse(prefix, &cfg)
} else {
yamlData, err := os.ReadFile(file)
if err != nil {
return "", err
}
return conf.Parse(prefix, &cfg, yaml.WithData(yamlData))
}
}()
help, err := conf.Parse(prefix, &cfg)
if err != nil {
if errors.Is(err, conf.ErrHelpWanted) {