diff options
| -rw-r--r-- | http.go | 59 | ||||
| -rw-r--r-- | patchsets.go | 94 |
2 files changed, 106 insertions, 47 deletions
@@ -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 } diff --git a/patchsets.go b/patchsets.go new file mode 100644 index 0000000..3dd7ba5 --- /dev/null +++ b/patchsets.go @@ -0,0 +1,94 @@ +package main + +import ( + "fmt" + "net/http" + "os" + "path/filepath" + "time" + + "go.wit.com/lib/protobuf/forgepb" + "go.wit.com/log" +) + +func getPatchset(w http.ResponseWriter, pbname string) { + if pbname == "" { + fmt.Fprintf(w, "filename was empty") + return + } + msg := fmt.Sprintf("filename = %s\n", pbname) + log.Info(msg) + + filename := filepath.Join(LIBDIR, "patchset/", pbname) + data, err := os.ReadFile(filename) + if err != nil { + msg := fmt.Sprintf("Error reading file %s: %v\n", filename, err) + fmt.Printf(msg) + fmt.Fprintf(w, msg) + return + } + var m *forgepb.Patchs + m = new(forgepb.Patchs) + if err := m.Unmarshal(data); err != nil { + msg := fmt.Sprintf("proto.Unmarshal() failed on %s len=%d\n", filename, len(data)) + fmt.Printf(msg) + fmt.Fprintf(w, msg) + msg = fmt.Sprintf("proto.Unmarshal() error %v\n", err) + fmt.Printf(msg) + fmt.Fprintf(w, msg) + return + } + log.Info("going to w.Write(data) with len", len(data)) + w.Write(data) +} + +func listPatchsets(w http.ResponseWriter) { + dirname := filepath.Join(LIBDIR, "patchset/") + // Open the directory + entries, err := os.ReadDir(dirname) + if err != nil { + fmt.Printf("Error reading directory: %v\n", err) + fmt.Fprintf(w, "Error reading directory: %v\n", err) + return + } + + // Iterate through the directory entries + for _, entry := range entries { + // Check if the entry is a file and matches the *.pb pattern + if !entry.IsDir() && filepath.Ext(entry.Name()) == ".pb" { + fmt.Fprintln(w, entry.Name()) + fmt.Println(entry.Name()) + } + } +} + +func savePatchset(w http.ResponseWriter, msg []byte) { + 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 + } + regfile.Write(msg) + regfile.Close() +} |