summaryrefslogtreecommitdiff
path: root/draw.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-18 00:57:43 -0600
committerJeff Carr <[email protected]>2024-01-18 00:57:43 -0600
commitff3a51f3544a255b2b2bcd489e7ef71a12e7196a (patch)
tree16a0b17d227c71dcb6f96f2ed226a6cbcb712710 /draw.go
parent47a665be8bf2724730698fb6775b2f8d904f8629 (diff)
gofmt autofix pathsv0.12.9
Signed-off-by: Jeff Carr <[email protected]>
Diffstat (limited to 'draw.go')
-rw-r--r--draw.go56
1 files changed, 29 insertions, 27 deletions
diff --git a/draw.go b/draw.go
index 9047808..707abe4 100644
--- a/draw.go
+++ b/draw.go
@@ -1,19 +1,21 @@
package repostatus
-import (
+import (
"strconv"
"strings"
- "go.wit.com/log"
"go.wit.com/gui/gui"
- "go.wit.com/gui/widget"
- "go.wit.com/gui/gadgets"
+ "go.wit.com/lib/gadgets"
+ "go.wit.com/lib/widget"
+ "go.wit.com/log"
)
// creates the actual widgets.
// it's assumed you are always passing in a box
func (rs *RepoStatus) draw() {
- if ! rs.Ready() {return}
+ if !rs.Ready() {
+ return
+ }
// display the status of the git repository
rs.drawGitStatus()
@@ -33,8 +35,8 @@ func (rs *RepoStatus) drawGitBranches() {
newgrid := rs.gitBranchesGroup.NewGrid("gridnuts", 2, 2)
rs.masterDrop = gadgets.NewBasicDropdown(newgrid, "main branch")
- rs.develDrop = gadgets.NewBasicDropdown(newgrid, "devel branch")
- rs.userDrop = gadgets.NewBasicDropdown(newgrid, "user branch")
+ rs.develDrop = gadgets.NewBasicDropdown(newgrid, "devel branch")
+ rs.userDrop = gadgets.NewBasicDropdown(newgrid, "user branch")
var master = ""
all := rs.getBranches()
for _, branch := range all {
@@ -77,19 +79,19 @@ func (rs *RepoStatus) drawGitStatus() {
newgrid.Margin()
newgrid.Pad()
- rs.path = gadgets.NewOneLiner(newgrid, "path")
- rs.currentBranch = gadgets.NewOneLiner(newgrid, "branch")
- rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag")
- rs.currentVersion = gadgets.NewOneLiner(newgrid, "Version")
- rs.tagsDrop = gadgets.NewBasicDropdown(newgrid, "existing tags")
- rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master")
- rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel")
- rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user")
+ rs.path = gadgets.NewOneLiner(newgrid, "path")
+ rs.currentBranch = gadgets.NewOneLiner(newgrid, "branch")
+ rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag")
+ rs.currentVersion = gadgets.NewOneLiner(newgrid, "Version")
+ rs.tagsDrop = gadgets.NewBasicDropdown(newgrid, "existing tags")
+ rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master")
+ rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel")
+ rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user")
- rs.dirtyLabel = gadgets.NewOneLiner(newgrid, "dirty")
+ rs.dirtyLabel = gadgets.NewOneLiner(newgrid, "dirty")
- rs.speed = gadgets.NewOneLiner(newgrid, "refresh speed =")
- rs.speedActual = gadgets.NewOneLiner(newgrid, "speed actual =")
+ rs.speed = gadgets.NewOneLiner(newgrid, "refresh speed =")
+ rs.speedActual = gadgets.NewOneLiner(newgrid, "speed actual =")
}
func (rs *RepoStatus) drawGitCommands() {
@@ -109,7 +111,7 @@ func (rs *RepoStatus) drawGitCommands() {
log.Warn("something went wrong switching to the master branch. full stop!")
return
}
- if ! rs.runGitCommands() {
+ if !rs.runGitCommands() {
log.Warn("SOMETHING WENT WRONG")
return
}
@@ -118,17 +120,17 @@ func (rs *RepoStatus) drawGitCommands() {
})
rs.major = gadgets.NewBasicCombobox(newgrid, "major")
- rs.major.Custom = func () {
+ rs.major.Custom = func() {
rs.setTag()
rs.generateCmd()
}
rs.minor = gadgets.NewBasicCombobox(newgrid, "minor")
- rs.minor.Custom = func () {
+ rs.minor.Custom = func() {
rs.setTag()
rs.generateCmd()
}
rs.revision = gadgets.NewBasicCombobox(newgrid, "revision")
- rs.revision.Custom = func () {
+ rs.revision.Custom = func() {
rs.setTag()
rs.generateCmd()
}
@@ -136,19 +138,19 @@ func (rs *RepoStatus) drawGitCommands() {
rs.newversion = newgrid.NewLabel("3.1.4")
rs.versionMessage = gadgets.NewBasicEntry(newgrid, "tag message")
- rs.versionMessage.Custom = func () {
+ rs.versionMessage.Custom = func() {
rs.generateCmd()
}
rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd")
rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
- if ! rs.generateCmd() {
+ if !rs.generateCmd() {
log.Warn("something is wrong. fix the errors first")
return
}
rs.releaseVersion.Disable()
log.Warn("COMMIT IT HERE")
- if ! rs.runGitCommands() {
+ if !rs.runGitCommands() {
log.Warn("SOMETHING WENT WRONG")
}
rs.Update()
@@ -280,7 +282,7 @@ func (rs *RepoStatus) generateCmd() bool {
// or something the users might see.
// aka: "Topsy", "Picasso", "Buzz", etc
- if ! rs.setTag() {
+ if !rs.setTag() {
log.Warn("tag sucked. fix your tag version")
rs.versionMessage.SetLabel("tag message (bad version)")
rs.releaseVersion.Disable()
@@ -328,7 +330,7 @@ func (rs *RepoStatus) setGitCommands() {
var all [][]string
newTag := rs.newversion.String()
- line1 = append(line1, "git", "tag", "v" + newTag, "-m", rs.versionMessage.String())
+ line1 = append(line1, "git", "tag", "v"+newTag, "-m", rs.versionMessage.String())
all = append(all, line1)
line2 = append(line2, "git", "push", "--tags")
all = append(all, line2)