diff options
| -rw-r--r-- | Load.go | 17 | ||||
| -rw-r--r-- | init.go | 12 | ||||
| -rw-r--r-- | scanRepoDir.go | 4 |
3 files changed, 18 insertions, 15 deletions
@@ -21,10 +21,11 @@ import ( ) func (pb *ForgeConfigs) loadConfig() error { - filename, err := config.LoadByAppName(pb, "forge", "forge") - log.Printf("%s loadConfig() about to load Config from %s\n", argvpb.GetAPPNAME(), filename) + pb.Filename = config.MakeConfigFilename("forge", "forge") + err := config.ReLoad(pb) + log.Printf("%s loadConfig() about to load Config from %s\n", argvpb.GetAPPNAME(), pb.Filename) if err != nil { - log.Info("couldn't load filename:", filename) + log.Info("couldn't load filename:", pb.Filename) log.Info("forge has not been configured") panic("config failed to load. make a new/blank forge config here?") } @@ -56,8 +57,11 @@ func (f *Forge) reposCacheLoad() error { return errors.New("already loaded") } f.Repos = gitpb.NewRepos() - err := config.LoadAppnameCache(f.Repos, "forge") - ENV.SetGlobal("lib/forgepb", "ReposPB", f.Repos.Filename) + f.Repos.Filename = config.MakeCacheFilename("forge", "repos") + err := config.ReLoad(f.Repos) + if err == nil { + ENV.SetGlobal("lib/forgepb", "ReposPB", f.Repos.Filename) + } return err } @@ -66,7 +70,8 @@ func (f *Forge) patchesCacheLoad() error { return errors.New("already loaded") } f.Patches = NewPatches() - err := config.LoadAppnameCache(f.Patches, "forge") + f.Patches.Filename = config.MakeCacheFilename("forge", "patches") + err := config.ReLoad(f.Patches) if errors.Is(err, os.ErrNotExist) { // is a new file f.Patches.Save() @@ -34,17 +34,15 @@ func Init() (*Forge, error) { } func InitByAppname(argname string) (*Forge, error) { - f := new(Forge) - f.Config = NewForgeConfigs() - err := f.Config.loadConfig() - err = errors.Join(err, f.postInit()) - return f, err + log.Info("InitByAppname() IS DEPRECATED AND DOESNT DO ANYTHING") + return Init() } func InitByFullpath(filename string) (*Forge, error) { f := new(Forge) cfg := NewForgeConfigs() - err := config.LoadFile(cfg, filename) + cfg.Filename = filename + err := config.ReLoad(cfg) f.Config = cfg err = errors.Join(err, f.postInit()) @@ -108,7 +106,7 @@ func (f *Forge) postInit() error { // panic() here? // warning? // (probably not. it's just the repos.pb cache file err := f.reposCacheLoad() // loads the file from ~/.cache/forge/repos.pb if err == nil { - // log.Printf("forge loaded %s file with len(%d) repos\n", f.Repos.Filename, f.Repos.Len()) + log.Printf("forge loaded %s file with len(%d) repos\n", f.Repos.Filename, f.Repos.Len()) } else { log.Printf("forge failed to load %s file with len(%d) repos err=(%v)\n", f.Repos.Filename, f.Repos.Len(), err) panic("failed to load repos.pb") diff --git a/scanRepoDir.go b/scanRepoDir.go index 062a30b..70cd74b 100644 --- a/scanRepoDir.go +++ b/scanRepoDir.go @@ -41,13 +41,13 @@ func (f *Forge) checkNamespace(fullpath string) (*gitpb.Repo, error) { func (f *Forge) RescanRepos() error { gopath := ENV.Get("gopath") log.Info("RescanRepos() running in", gopath) - f.ScanRepoDir(gopath) + // f.scanRepoDir(gopath) f.Save() return errors.New("ScanReposByMode() not implemented yet") } // scans for .git/ directories -func (f *Forge) ScanRepoDir(path string) error { +func (f *Forge) scanRepoDir(path string) error { if path == "" { return errors.New("ScanRepoDir() got sent blank dir") } |