fix changes related to plugin updates

This commit is contained in:
Jeff Carr 2025-02-14 00:09:37 -06:00
parent 225cd84f68
commit 8f514d4268
7 changed files with 33 additions and 101 deletions

View File

@ -82,6 +82,7 @@ func findNext() bool {
}
if godepsNew == nil {
// don't check godepsNew, but check to make sure go mod tidy actually ran without error
os.Unsetenv("GO111MODULE")
cmd := []string{"go", "mod", "tidy"}
_, err := check.RunVerbose(cmd)
if err != nil {
@ -206,7 +207,7 @@ func setCurrentRepo(check *gitpb.Repo, s string, note string) bool {
}
me.release.status.SetText(s)
me.release.notes.SetText(note)
me.release.openrepo.Enable()
// me.release.openrepo.Enable()
return true
}

View File

@ -4,7 +4,6 @@ import (
"go.wit.com/gui"
"go.wit.com/lib/debugger"
"go.wit.com/lib/gui/logsettings"
"go.wit.com/log"
)
func globalDisplayOptions(box *gui.Node) {
@ -12,17 +11,18 @@ func globalDisplayOptions(box *gui.Node) {
group1 := vbox.NewGroup("Global Display Options")
hidegrid := group1.NewGrid("hidecfg", 0, 0)
hidegrid.NewButton("Show Repository Window", func() {
if me.repos.Hidden() {
me.repos.Show()
} else {
me.repos.Hide()
}
log.Info("showing reposwin")
})
hidegrid.NextRow()
/*
hidegrid := group1.NewGrid("hidecfg", 0, 0)
hidegrid.NewButton("Show Repository Window", func() {
if me.repos.Hidden() {
me.repos.Show()
} else {
me.repos.Hide()
}
log.Info("showing reposwin")
})
hidegrid.NextRow()
*/
group1 = vbox.NewGroup("prep for release")
grid := group1.RawGrid()

View File

@ -72,8 +72,6 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
// log.Info(me.current.StandardHeader())
log.Info(me.forge.StandardReleaseHeader(me.current, "todoing"))
case "/rescanAll":
me.repos.View.ScanRepositoriesOld()
case "/setCurrentRepo":
log.Info("repo: " + repoName)
log.Info("version: " + version)

12
main.go
View File

@ -10,6 +10,7 @@ import (
"go.wit.com/dev/alexflint/arg"
"go.wit.com/gui"
"go.wit.com/lib/fhelp"
"go.wit.com/lib/gadgets"
"go.wit.com/lib/gui/shell"
"go.wit.com/lib/protobuf/forgepb"
"go.wit.com/lib/protobuf/gitpb"
@ -65,14 +66,17 @@ func main() {
me.myGui.Default()
// our main window
me.mainWindow = me.myGui.NewWindow("GUI release manager " + VERSION)
me.mainWindow = gadgets.RawBasicWindow("GUI release manager " + VERSION)
me.mainWindow.Custom = func() {
log.Warn("Window closed. forge configsave")
// sets the hidden flag to false so Toggle() works
me.forge.ConfigSave()
okExit("")
}
me.mainBox = me.mainWindow.NewBox("bw hbox", true)
me.mainWindow.Make()
me.mainWindow.Show()
me.mainBox = me.mainWindow.Box()
// sanity check of things that might be around that mess
// up things later
@ -88,7 +92,7 @@ func main() {
// initialize the repo list window
// which should be all the git repositories in ~/go/src & the .config file
me.repos = makeRepoView()
// me.repos = makeRepoView()
// the left side of the window options
globalDisplayOptions(me.mainBox)
@ -102,7 +106,7 @@ func main() {
// scan in the State of all the repos
// TODO: should not really be necessary directly after init()
me.repos.View.ScanRepositoriesOld()
// me.repos.View.ScanRepositoriesOld()
// todo: add this to forgepb
me.startRepo = me.forge.FindWorkingDirRepo()

View File

@ -21,7 +21,7 @@ type releaseStruct struct {
releaseVersionB *gui.Node
reason *gadgets.BasicEntry
openrepo *gui.Node
// openrepo *gui.Node
goGetB *gui.Node
checkGoSumB *gui.Node
@ -77,12 +77,14 @@ func createReleaseBox(box *gui.Node) {
me.release.grid.NextRow()
me.release.repo = gadgets.NewOneLiner(me.release.grid, "repo")
me.release.openrepo = me.release.grid.NewButton("Configure", func() {
if repov := me.repos.View.FindByPath(me.current.GetGoPath()); repov != nil {
repov.Status.Toggle()
}
})
me.release.openrepo.Disable()
/*
me.release.openrepo = me.release.grid.NewButton("Configure", func() {
if repov := me.repos.View.FindByPath(me.current.GetGoPath()); repov != nil {
repov.Status.Toggle()
}
})
me.release.openrepo.Disable()
*/
me.release.grid.NextRow()
me.release.status = gadgets.NewOneLiner(me.release.grid, "status")
me.release.grid.NextRow()

View File

@ -1,73 +0,0 @@
package main
import (
"go.wit.com/lib/gadgets"
"go.wit.com/lib/gui/repolist"
"go.wit.com/log"
"go.wit.com/gui"
)
type repoWindow struct {
win *gadgets.BasicWindow
box *gui.Node
View *repolist.RepoList
}
func (r *repoWindow) Hidden() bool {
return r.win.Hidden()
}
func (r *repoWindow) Show() {
r.win.Show()
}
func (r *repoWindow) Hide() {
r.win.Hide()
}
func (r *repoWindow) Disable() {
r.box.Disable()
}
func (r *repoWindow) Enable() {
r.box.Enable()
}
// you can only have one of these
func makeRepoView() *repoWindow {
if me.repos != nil {
return me.repos
}
r := new(repoWindow)
r.win = gadgets.RawBasicWindow("GUI repositories in ~/go/src/")
r.win.Make()
r.box = r.win.Box().NewBox("bw vbox", false)
r.win.Custom = func() {
log.Warn("GOT HERE: main() gadgets.NewBasicWindow() close")
log.Warn("Should I do something special here?")
}
// reposbox.SetExpand(false)
group1 := r.box.NewGroup("Run on all repos:")
hbox := group1.Box()
// hbox.Horizontal()
hbox.Vertical()
r.View = repolist.InitBox(me.forge, r.box)
r.View.Enable()
r.View.ScanRepositoriesOld()
/*
r.View = repolist.GuireleaserView(r.box)
showncount := r.View.MirrorShownCount()
box2.Append(showncount)
duration := r.View.MirrorScanDuration()
box2.Append(duration)
*/
return r
}

View File

@ -29,11 +29,11 @@ type autoType struct {
startRepo *gitpb.Repo
// guireleaser window
mainWindow *gui.Node
mainWindow *gadgets.BasicWindow
mainBox *gui.Node
// our view of the repositories
repos *repoWindow
// repos *repoWindow
// your customized repo preferences and settings
forge *forgepb.Forge