diff options
| -rw-r--r-- | config.go | 36 | ||||
| -rw-r--r-- | forgeConfig.config.go | 5 | ||||
| -rw-r--r-- | goSrcScan.go | 2 |
3 files changed, 28 insertions, 15 deletions
@@ -3,28 +3,36 @@ package forgepb import ( + "go.wit.com/lib/fhelp" + "go.wit.com/lib/gui/prep" "go.wit.com/log" ) // returns err1 || err2 func (f *Forge) ConfigSave() error { var err error - if f.Config != nil { - if e := f.Config.ConfigSave(); e != nil { - log.Info("forge.Config.ConfigSave() error", e) - err = e - } + fhelp.DumpENV("forge:") + + if f.Config == nil { + return log.Errorf("forge.Config == nil") + } + + // only let forge save the config files (?) + if prep.AppName() == "forge" { + log.Info("Okay, this is forge") + } else { + log.Info("This is not forge") + return log.Errorf("Only forge can save the config files") + } + + f.Config.DumpENV() + if e := f.Config.ConfigSave(); e != nil { + log.Info("forge.Config.ConfigSave() error", e) + err = e } + if f.Repos != nil { - /* - // ??? - if f.HasFullScan() { - f.Repos.HasFullScan = true - t := time.Now() - f.Repos.FullScan = timestamppb.New(t) - } - */ - if e := f.Repos.ConfigSave(); e != nil { + if e := f.Repos.ConfigSave(f.Config.ReposPB); e != nil { log.Info("forge.Repos.ConfigSave() error", e) err = e } diff --git a/forgeConfig.config.go b/forgeConfig.config.go index 6c3c237..8916329 100644 --- a/forgeConfig.config.go +++ b/forgeConfig.config.go @@ -4,6 +4,7 @@ package forgepb import ( "go.wit.com/lib/config" + "go.wit.com/log" ) // functions to import and export the protobuf @@ -24,6 +25,10 @@ func (cfg *ForgeConfigs) ConfigSave() error { return config.ConfigSaveWithHeader(cfg, header) } +func (cfg *ForgeConfigs) DumpENV() { + log.Info("todo: DumpENV()") +} + // load the ~/.config/forge/ files func (c *ForgeConfigs) ConfigLoad(fullpath string) error { return nil diff --git a/goSrcScan.go b/goSrcScan.go index 1f07862..c55bb6e 100644 --- a/goSrcScan.go +++ b/goSrcScan.go @@ -14,7 +14,7 @@ import ( func reloadCheck(repo *gitpb.Repo) error { if err := repo.ReloadCheck(); err != nil { - log.Info("changed:", repo.FullPath) + log.Infof("%s reload() says %v\n", repo.FullPath, err) // configSave = true return err } |