From 6d047647497c1ad7315e727084a15194f0126ed9 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 20 Jan 2025 03:23:14 -0600 Subject: [PATCH] moved code to forgepb --- doGetPatchsets.go | 80 ----------------------------------------------- windowPatches.go | 2 +- 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 doGetPatchsets.go diff --git a/doGetPatchsets.go b/doGetPatchsets.go deleted file mode 100644 index 18db441..0000000 --- a/doGetPatchsets.go +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright 2024 WIT.COM Inc Licensed GPL 3.0 - -package main - -import ( - "bytes" - "io/ioutil" - "net/http" - "os" - "os/user" - - "go.wit.com/lib/protobuf/forgepb" - "go.wit.com/log" -) - -var forgeURL string = "https://go.wit.com/" - -func GetPatchesets() (*forgepb.Patchsets, error) { - url := forgeURL + "/GetPatchsets" - log.Info("GetPatchsets() url", url) - body, err := httpPost(url, nil) - if err != nil { - log.Info("httpPost() failed:", err) - return nil, err - } - log.Info("GetPatchets() len(body)", len(body)) - var psets *forgepb.Patchsets - psets = new(forgepb.Patchsets) - err = psets.Unmarshal(body) - if err != nil { - log.Info("Unmarshal failed", err) - return nil, err - } - /* - filename := filepath.Join("/tmp", pbfile) - f, _ := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) - f.Write(body) - f.Close() - */ - return psets, nil -} - -func httpPost(url string, data []byte) ([]byte, error) { - var err error - var req *http.Request - - // data := []byte("some junk") - // url := "https://go.wit.com/register/" - - req, err = http.NewRequest(http.MethodPost, url, bytes.NewBuffer(data)) - log.Info("httpPost() with len", len(data), "url", url) - - usr, _ := user.Current() - req.Header.Set("author", usr.Username) - hostname, _ := os.Hostname() - req.Header.Set("hostname", hostname) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - log.Error(err) - return []byte("client.Do(req) error"), err - } - defer resp.Body.Close() - log.Info("httpPost() with len", len(data)) - - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Error(err) - return body, err - } - - // test := strings.TrimSpace(string(body)) - // log.Info("go.wit.com returned body:", test) - // if test == "OK" { - // return body, nil - // } - - return body, nil -} diff --git a/windowPatches.go b/windowPatches.go index 907a796..5a164b4 100644 --- a/windowPatches.go +++ b/windowPatches.go @@ -92,7 +92,7 @@ func (r *patchesWindow) initGroup() *gui.Node { hbox.NewButton("Get Patchsets", func() { // if psets, err := me.forge.GetPatchesets(); err != nil { - psets, err := GetPatchesets() + psets, err := me.forge.GetPatchesets() if err != nil { log.Info(err) return