fix patchset initHEADv0.0.71masterdevel

3 files changed, 16 insertions, 20 deletions

diff --git a/handleRepos.go b/handleRepos.go
index 5a1f07f..b878cd9 100644
--- a/handleRepos.go
+++ b/handleRepos.go
@@ -79,7 +79,7 @@ func checkRequest(pb *gitpb.Repos, reqPB *httppb.HttpRequest) *gitpb.Repos {
 		}
 		checkPB.Append(found)
 	}
-	saveMissing()
+	me.missing.Save()
 	return checkPB
 }
 
diff --git a/http.go b/http.go
index 436d118..bc253c2 100644
--- a/http.go
+++ b/http.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -21,6 +22,7 @@ func logReqPB(pb *httppb.HttpRequest) {
 }
 
 func okHandler(w http.ResponseWriter, r *http.Request) {
+	log.Info("GOT TO okHandler()")
 	reqPB, err := httppb.ReqToPB(r)
 	reqPB.Logf("START: Got %d bytes from the client", len(reqPB.ClientData))
 	if err != nil {
@@ -78,6 +80,9 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		result := new(forgepb.Set)
 		switch route {
 		case "/set/new":
+			if me.Patchsets == nil {
+				argvpb.BadExit("patchsets == nil", errors.New("patchsets == nil"))
+			}
 			me.Patchsets.Append(pb)
 			reqPB.Logf("addNewPatches() pb.Patches.Len()=%d Patchsets.Len()=%d", pb.Patches.Len(), me.Patchsets.Len())
 			me.forge.SavePatchsets()
diff --git a/main.go b/main.go
index 3cf1d1b..7a51508 100644
--- a/main.go
+++ b/main.go
@@ -2,13 +2,11 @@ package main
 
 import (
 	"embed"
-	"errors"
 	"fmt"
 	"net/http"
-	"os"
-	"path/filepath"
 	"time"
 
+	"go.wit.com/lib/config"
 	"go.wit.com/lib/env"
 	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/forgepb"
@@ -21,14 +19,6 @@ var resources embed.FS
 
 var HOSTNAME string = "forge.wit.com"
 
-func saveMissing() error {
-	err := me.missing.SaveValidate(filepath.Join(env.Get("ReposDir"), "missing.pb"))
-	if err != nil {
-		log.Info("failed to save missing.pb", err)
-	}
-	return err
-}
-
 func main() {
 	me = new(mainType)
 	argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete
@@ -53,18 +43,19 @@ func main() {
 	}
 
 	me.missing = gitpb.NewRepos()
-	err = me.missing.ConfigLoad(filepath.Join(env.Get("ReposDir"), "missing.pb"))
-	if errors.Is(err, os.ErrNotExist) {
-		saveMissing()
-	} else if err != nil {
+	me.missing.Filename = config.MakeConfigFilename("forged", "missing")
+	err = me.missing.CacheLoad()
+	if err != nil {
 		log.Info("loading missing.pb failed", err)
 		badExit(err)
 	}
 
-	if argv.Missing != nil {
-		log.Info("loading missing.pb worked len =", me.missing.Len())
-		me.missing.PrintMissingTable()
-		okExit("")
+	me.Patchsets = forgepb.NewSets()
+	me.Patchsets.Filename = config.MakeConfigFilename("forged", "sets")
+	err = config.LoadCacheDir(me.Patchsets)
+	if err != nil {
+		log.Info("loading patchsets file sets.pb failed", err)
+		badExit(err)
 	}
 
 	if argv.Repos != nil {