From 0ca10f55534c057c651d136c89d096224a6f6461 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 30 Jan 2024 13:50:34 -0600 Subject: [PATCH] more code removals Signed-off-by: Jeff Carr --- listWindow.go | 232 ----------------------------------------------- releaseWindow.go | 2 +- 2 files changed, 1 insertion(+), 233 deletions(-) delete mode 100644 listWindow.go diff --git a/listWindow.go b/listWindow.go deleted file mode 100644 index 876aab0..0000000 --- a/listWindow.go +++ /dev/null @@ -1,232 +0,0 @@ -// This is a simple example -package main - -import ( - "io/ioutil" - "net/http" - "os" - "path/filepath" - "strings" - - "go.wit.com/gui" - "go.wit.com/log" - - "go.wit.com/lib/gadgets" - "go.wit.com/lib/gui/repostatus" -) - -var lw *gadgets.BasicWindow - -var allsections []*section - -type witRepo struct { - sec *section - path *gui.Node - downloadB *gui.Node -} - -type section struct { - name string - hidden bool - - parent *gui.Node - box *gui.Node - group *gui.Node - grid *gui.Node // where the repos are listed - hideCB *gui.Node - downloadAllB *gui.Node - witRepos []*witRepo -} - -func listWindow() { - if lw != nil { - lw.Toggle() - return - } - lw = gadgets.NewBasicWindow(me.myGui, "go.wit.com repositories") - lw.Custom = func() { - log.Warn("got to close") - } - - lw.Make() - lw.StandardClose() - lw.Draw() - box := lw.Box() - group := box.NewGroup("list") - group.NewButton("blah", func() {}) - - var lines []string - var curs *section - - lines = dumpURL("https://go.wit.com/list") - for i, line := range lines { - if line == "" { - continue - } - if line[0] == '#' { - curs = NewSection(group, line) - log.Warn("new group:", line) - continue - } - log.Warn(i, line) - parts := strings.Split(line, " ") - if curs != nil { - curs.add(parts[0]) - } - } - for i, sec := range allsections { - log.Info("section name:", sec.name, "hidden:", sec.hidden, i) - parts := strings.Split(sec.name, " ") - if len(parts) > 1 { - if parts[1] != "Applications" { - sec.Hide() - } - } - } - // lw.Toggle() -} - -func downloadRepo(path string) bool { - log.Info("downloading", path, "here") - os.Setenv("GO111MODULE", "off") - - goSrcDir := me.goSrcPwd.String() - if !quickCmd(goSrcDir, []string{"go", "get", "-v", path}) { - log.Info("go get failed") - return false - } - - fullpath := filepath.Join(goSrcDir, path) - if !quickCmd(fullpath, []string{"go", "get", "-v", "-u", "."}) { - log.Info("go get depends failed") - return false - } - if me.autoDryRun.Checked() { - return false - } - return true -} - -func (r *witRepo) doDownload() bool { - if me.autoDryRun.Checked() { - r.downloadB.SetLabel("uncheck --dry-run") - return false - } - if r.downloadB.String() == "downloaded" { - log.Info("skipping already downloaded", r.path.String()) - return true - } - if downloadRepo(r.path.String()) { - log.Info("download", r.path.String(), "worked") - r.downloadB.SetLabel("downloaded") - r.downloadB.Disable() - } else { - r.downloadB.SetLabel("failed") - log.Info("download", r.path.String(), "failed") - return false - } - return true -} - -func (s *section) add(path string) { - if s == nil { - return - } - tmp := new(witRepo) - tmp.sec = s - tmp.path = s.grid.NewLabel(path) - tmp.downloadB = s.grid.NewButton("download", func() { - lw.Disable() - tmp.doDownload() - lw.Enable() - }) - if repostatus.VerifyLocalGoRepo(path) { - log.Verbose("newRepo actually exists", path) - tmp.downloadB.SetLabel("downloaded") - tmp.downloadB.Disable() - } - - s.witRepos = append(s.witRepos, tmp) -} - -func NewSection(parent *gui.Node, desc string) *section { - news := new(section) - news.name = desc - news.parent = parent - news.box = news.parent.NewBox("bw vbox", true) - news.group = news.box.NewGroup(desc) - news.hideCB = news.box.NewCheckbox("hide") - news.hideCB.Custom = func() { - news.toggle() - } - news.downloadAllB = news.box.NewButton("download all", func() { - lw.Disable() - log.Warn("Download all here") - for i, wrepo := range news.witRepos { - log.Warn("download:", i, wrepo.path.String()) - wrepo.doDownload() - //wrepo.path.Show() - //wrepo.downloadB.Show() - } - lw.Enable() - }) - news.grid = news.parent.NewGrid("sections", 2, 1) - allsections = append(allsections, news) - return news -} - -func (s *section) toggle() { - log.Warn(s.name) - if s.hidden { - s.hidden = false - for i, wrepo := range s.witRepos { - log.Warn(i, wrepo.path.String()) - wrepo.path.Show() - wrepo.downloadB.Show() - } - } else { - s.Hide() - } -} - -func (s *section) Hide() { - s.hidden = true - s.hideCB.SetChecked(true) - for i, wrepo := range s.witRepos { - log.Warn(i, wrepo.path.String()) - wrepo.path.Hide() - wrepo.downloadB.Hide() - } -} - -/* -func dumpURL(url string) string { - resp, err := http.Get(url) - if err != nil { - return "" - } - defer resp.Body.Close() - - return resp.Body.String() - - _, err = io.Copy(os.Stdout, resp.Body) - if err != nil { - return "" - } -} -*/ - -func dumpURL(url string) []string { - resp, err := http.Get(url) - if err != nil { - return nil - } - defer resp.Body.Close() - - bodyBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil - } - - return strings.Split(string(bodyBytes), "\n") -} diff --git a/releaseWindow.go b/releaseWindow.go index dc953ea..19ada35 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -45,7 +45,7 @@ func createReleaseWindow() { return } - versionS := "0.14.0" + versionS := "0.17.0" reasonS := "gocui" partS := strings.Split(versionS, ".")