Opt: remove custom config file

pull/39/head
zijiren233 1 year ago
parent 34ae7208c6
commit 94717216c6

@ -6,8 +6,6 @@ var (
LogStd bool
ConfigFile string
SkipEnv bool
SkipConfig bool

@ -40,7 +40,6 @@ func init() {
home = "~"
}
RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data-dir", filepath.Join(home, ".synctv"), "data dir")
RootCmd.PersistentFlags().StringVarP(&flags.ConfigFile, "config", "f", "", "config file path")
}
func init() {

@ -25,20 +25,16 @@ func InitConfig(ctx context.Context) (err error) {
}
conf.Conf = conf.DefaultConfig()
if !flags.SkipConfig {
if flags.ConfigFile == "" {
flags.ConfigFile = filepath.Join(flags.DataDir, "config.yaml")
} else {
flags.ConfigFile, err = utils.OptFilePath(flags.ConfigFile)
if err != nil {
log.Fatalf("config file path error: %v", err)
}
configFile, err := utils.OptFilePath(filepath.Join(flags.DataDir, "config.yaml"))
if err != nil {
log.Fatalf("config file path error: %v", err)
}
err = confFromConfig(flags.ConfigFile, conf.Conf)
err = confFromConfig(configFile, conf.Conf)
if err != nil {
log.Fatalf("load config from file error: %v", err)
}
log.Infof("load config success from file: %s", flags.ConfigFile)
if err = restoreConfig(flags.ConfigFile, conf.Conf); err != nil {
log.Infof("load config success from file: %s", configFile)
if err = restoreConfig(configFile, conf.Conf); err != nil {
log.Warnf("restore config error: %v", err)
} else {
log.Info("restore config success")

Loading…
Cancel
Save