diff options
| -rw-r--r-- | forgeConfig.config.go | 17 | ||||
| -rw-r--r-- | init.go | 76 |
2 files changed, 23 insertions, 70 deletions
diff --git a/forgeConfig.config.go b/forgeConfig.config.go index 6102d03..f62ac35 100644 --- a/forgeConfig.config.go +++ b/forgeConfig.config.go @@ -23,3 +23,20 @@ func (cfg *ForgeConfigs) ConfigSave() error { func (c *ForgeConfigs) ConfigLoad(fullpath string) error { return nil } + +/* + if f.Config.Username == "" { + usr, _ := user.Current() + f.Config.Username = usr.Username + f.SetConfigSave(true) + } + + if f.Config.Xterm == "" { + f.Config.Xterm = "xterm" + f.Config.XtermArgv = append(f.Config.XtermArgv, "-bg") + f.Config.XtermArgv = append(f.Config.XtermArgv, "black") + f.Config.XtermArgv = append(f.Config.XtermArgv, "-fg") + f.Config.XtermArgv = append(f.Config.XtermArgv, "white") + f.SetConfigSave(true) + } +*/ @@ -4,9 +4,10 @@ package forgepb import ( "os" - "os/user" + "time" "go.wit.com/lib/fhelp" + "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -21,32 +22,12 @@ func Default(opts ...OptionFunc) *Engine { } */ -/* -func Init() *Forge { - f := InitPB() - - if f.Config.Username == "" { - usr, _ := user.Current() - f.Config.Username = usr.Username - f.SetConfigSave(true) - } - - if f.Config.Xterm == "" { - f.Config.Xterm = "xterm" - f.Config.XtermArgv = append(f.Config.XtermArgv, "-bg") - f.Config.XtermArgv = append(f.Config.XtermArgv, "black") - f.Config.XtermArgv = append(f.Config.XtermArgv, "-fg") - f.Config.XtermArgv = append(f.Config.XtermArgv, "white") - f.SetConfigSave(true) - } - - // f.Machine.InitWit() - +func (f *Forge) InitScan() { if f.hasFullScan { // duplicate time checking below. which one to keep? if f.FullScanAge() > time.Minute { log.Log(INFO, "forgepb.Scan() skipping scan. been run a minute ago", f.FullScanAge()) - return f + return } } @@ -71,9 +52,7 @@ func Init() *Forge { f.configSave = false } log.Log(INFO, "update() check took", shell.FormatDuration(time.Since(now))) - return f } -*/ func InitFromConfig(cfg *ForgeConfigs) *Forge { f := new(Forge) @@ -98,30 +77,6 @@ func InitFromConfig(cfg *ForgeConfigs) *Forge { } /* -func (f *Forge) InitPB() { - f.setenv() - - // load the ~/.config/forge/ config - f.Config = new(ForgeConfigs) - if err := f.Config.ConfigLoad(f.configDir); err != nil { - log.Log(WARN, "forgepb.ConfigLoad() failed", err) - } - - f.Repos = gitpb.NewRepos() - f.Repos.ConfigLoad() - if f.Repos.HasFullScan { - f.hasFullScan = true - } - - // init the Patchsets - f.Patchsets = NewPatchsets() - - // todo: play with these / determine good values based on user's machine - f.rillX = 10 - f.rillY = 20 -} -*/ - func (f *Forge) InitMachine() { if f.Config.Username == "" { usr, _ := user.Current() @@ -130,15 +85,6 @@ func (f *Forge) InitMachine() { f.hostname, _ = os.Hostname() // log.Info(hostname, err) } - -/* -// only init's the protobuf. intended to not scan or change anything -func InitPB() *Forge { - f := new(Forge) - f.setenv() - f.InitPB() - return f -} */ func (f *Forge) SetConfigSave(b bool) { @@ -155,18 +101,6 @@ func (f *Forge) Exit() { os.Exit(0) } -/* -func RawInitPB() *Forge { - f := new(Forge) - f.RawInitPB() - return f -} - -func (f *Forge) RawInitPB() { - f.InitPB() -} -*/ - // the first thing done is process any ENV settings // try to NOT use the ENV settings anywhere but here // all initial ENV settings should be stored in the forge struct @@ -193,6 +127,7 @@ func (f *Forge) setenv() { }) } +/* // if the env vars are set, this is probably not a new user func checkenv() bool { if os.Getenv("FORGE_CONFIG") != "" { @@ -215,6 +150,7 @@ func checkenv() bool { } return false } +*/ func (f *Forge) GetForgeURL() string { return f.forgeURL |