get, list, and send patch sets()v0.22.18v0.22.17v0.22.16v0.22.15v0.22.14v0.22.13v0.22.12v0.22.11

1 files changed, 12 insertions, 47 deletions

diff --git a/http.go b/http.go
index 7e38afa..f098827 100644
--- a/http.go
+++ b/http.go
@@ -7,10 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
-	"go.wit.com/lib/protobuf/forgepb"
-	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
 
@@ -26,19 +23,17 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		log.Info("ioutil.ReadAll() error =", err)
 		return
 	}
-	log.Info("ioutil.ReadAll() msg =", len(msg))
-	fmt.Fprintln(w, "ioutil.ReadAll() msg =", len(msg))
+	// fmt.Fprintln(w, "ioutil.ReadAll() msg =", len(msg))
 	// dumpClient(accessf, clientf, r)
 	var route string
 	// tmp = r.URL.String()
 	route = cleanURL(r.URL.Path)
 	parts := strings.Split(route, "?")
-	log.Info("client sent url =", route)
-	log.Info("parts are:", parts)
+	log.Info("client sent url =", route, parts)
 	requrl := parts[0]
 
 	url, repourl := findkey(requrl)
-	log.Warn("gowebd URL =", url, "REPO URL =", repourl, "REQUEST URL =", requrl)
+	log.Warn("gowebd URL =", url, "REPO URL =", repourl, "REQUEST URL =", requrl, "msg =", len(msg))
 	if repourl != "" {
 		repoHTML(w, url, repourl)
 		return
@@ -83,48 +78,18 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if route == "/machine" {
-		var m *zoopb.Machine
-		m = new(zoopb.Machine)
-		if err := m.Unmarshal(msg); err != nil {
-			log.Info("proto.Unmarshal() failed on wire message len", len(msg))
-			log.Info("error =", err)
-			return
-		}
-		log.Info("GOT patchset:", len(msg))
-		fmt.Fprintln(w, "GOT patchset:", len(msg))
+	if route == "/patchset" {
+		savePatchset(w, msg)
 		return
 	}
 
-	if route == "/patchset" {
-		log.Info("proto.Unmarshal() try message len", len(msg))
-		var m *forgepb.Patchs
-		m = new(forgepb.Patchs)
-		if err := m.Unmarshal(msg); err != nil {
-			log.Info("proto.Unmarshal() failed on wire message len", len(msg))
-			log.Info("error =", err)
-			return
-		}
-		log.Info("GOT patchset:", len(msg))
-		fmt.Fprintln(w, "GOT patchset:", len(msg))
-		all := m.SortByFilename()
-		for all.Scan() {
-			repo := all.Next()
-			log.Info("filename:", repo.Filename)
-			fmt.Fprintln(w, "filename:", repo.Filename)
-		}
-		now := time.Now()
-		// timestamp := now.Format("2022.07.18.190545") // 50yr shout out to K&R
-		timestamp := now.Format("2006.01.02.150405") // bummer. other date doesn't work?
-		filename := filepath.Join(LIBDIR, "patchset/", timestamp+".submitted.pb")
-		regfile, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-		if err != nil {
-			log.Info("filename open error:", filename, err)
-			fmt.Fprintln(w, "filename open error:", filename, err)
-			return
-		}
-		fmt.Fprint(regfile, msg)
-		regfile.Close()
+	if route == "/patchsetlist" {
+		listPatchsets(w)
+		return
+	}
+	if route == "/patchsetget" {
+		filename := r.URL.Query().Get("filename")
+		getPatchset(w, filename)
 		return
 	}