forked from Elara6331/itd
Hunman
15b5d2888e
Figured out the problem in issue #32, the toml file syntax was invalid (I had `'` instead of `"` at some values), but there was nothing in the logs about it.
Moved the config reading (and watching) into the same function, which logs the error as a warning.
I wanted to try moving the whole `if` into a separate function, but I kept getting errors when I tried to extract the `path` from the `File`, so I have that attempt in a separate branch not in this pull request: 5a84bf8148
Reviewed-on: https://gitea.arsenm.dev/Arsen6331/itd/pulls/47
Co-authored-by: Hunman <sanyi.exe@gmail.com>
Co-committed-by: Hunman <sanyi.exe@gmail.com>
111 lines
2.5 KiB
Go
111 lines
2.5 KiB
Go
package main
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/knadh/koanf/parsers/toml"
|
|
"github.com/knadh/koanf/providers/confmap"
|
|
"github.com/knadh/koanf/providers/env"
|
|
"github.com/knadh/koanf/providers/file"
|
|
"github.com/rs/zerolog"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
var cfgDir string
|
|
|
|
func init() {
|
|
etcPath := "/etc/itd.toml";
|
|
|
|
// Set up logger
|
|
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
|
|
|
|
// Get user's configuration directory
|
|
userCfgDir, err := os.UserConfigDir()
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
cfgDir = filepath.Join(userCfgDir, "itd")
|
|
|
|
// If config dir is not readable
|
|
if _, err = os.ReadDir(cfgDir); err != nil {
|
|
// Create config dir with 700 permissions
|
|
err = os.MkdirAll(cfgDir, 0o700)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
// Get current and old config paths
|
|
cfgPath := filepath.Join(cfgDir, "itd.toml")
|
|
oldCfgPath := filepath.Join(userCfgDir, "itd.toml")
|
|
|
|
// If old config path exists
|
|
if _, err = os.Stat(oldCfgPath); err == nil {
|
|
// Move old config to new path
|
|
err = os.Rename(oldCfgPath, cfgPath)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
// Set config defaults
|
|
setCfgDefaults()
|
|
|
|
// Load and watch config files
|
|
loadAndwatchCfgFile(etcPath)
|
|
loadAndwatchCfgFile(cfgPath)
|
|
|
|
// Load envireonment variables
|
|
k.Load(env.Provider("ITD_", "_", func(s string) string {
|
|
return strings.ToLower(strings.TrimPrefix(s, "ITD_"))
|
|
}), nil)
|
|
}
|
|
|
|
func loadAndwatchCfgFile(filename string) {
|
|
provider := file.Provider(filename)
|
|
|
|
if cfgError := k.Load(provider, toml.Parser()); cfgError != nil {
|
|
log.Warn().Str("filename", filename).Err(cfgError).Msg("Error while trying to read config file")
|
|
}
|
|
|
|
// Watch for changes and reload when detected
|
|
provider.Watch(func(_ interface{}, err error) {
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
if cfgError := k.Load(provider, toml.Parser()); cfgError != nil {
|
|
log.Warn().Str("filename", filename).Err(cfgError).Msg("Error while trying to read config file")
|
|
}
|
|
})
|
|
}
|
|
|
|
func setCfgDefaults() {
|
|
k.Load(confmap.Provider(map[string]interface{}{
|
|
"bluetooth.adapter": "hci0",
|
|
|
|
"socket.path": "/tmp/itd/socket",
|
|
|
|
"conn.reconnect": true,
|
|
|
|
"conn.whitelist.enabled": false,
|
|
"conn.whitelist.devices": []string{},
|
|
|
|
"on.connect.notify": true,
|
|
|
|
"on.reconnect.notify": true,
|
|
"on.reconnect.setTime": true,
|
|
|
|
"notifs.translit.use": []string{"eASCII"},
|
|
"notifs.translit.custom": []string{},
|
|
|
|
"notifs.ignore.sender": []string{},
|
|
"notifs.ignore.summary": []string{"InfiniTime"},
|
|
"notifs.ignore.body": []string{},
|
|
|
|
"music.vol.interval": 5,
|
|
}, "."), nil)
|
|
}
|