try to refector to work against git.Repo

4 files changed, 94 insertions, 83 deletions

diff --git a/build.go b/build.go
index 80ee9dc..0904c0b 100644
--- a/build.go
+++ b/build.go
@@ -38,7 +38,10 @@ func buildPackage(repo *gitpb.Repo) (bool, error) {
 	}
 
 	arch := repo.Control["Architecture"] // c.Architecture.String()
-	version := repo.Control["Version"]
+	if arch == "" {
+		arch = "amd64" // todo: detect what you are building on
+	}
+	version := repo.GetCurrentVersion()
 	log.Info("version is:", version)
 	debname := filename + "_" + version + "_" + arch + ".deb"
 	var fulldebname string
@@ -207,7 +210,7 @@ func buildPackage(repo *gitpb.Repo) (bool, error) {
 	shell.Run([]string{"dpkg-deb", "--build", "files", fulldebname})
 	if shell.Exists(fulldebname) {
 	} else {
-		log.Warn("build failed", fulldebname)
+		log.Warn("build failed: full name was not created:", fulldebname)
 		return false, errors.New("dpkg-deb --build failed")
 	}
 	shell.Run([]string{"dpkg-deb", "-I", fulldebname})
diff --git a/doGui.go b/doGui.go
index 961e2a6..ac46def 100644
--- a/doGui.go
+++ b/doGui.go
@@ -6,6 +6,7 @@ package main
 import (
 	"os"
 
+	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
@@ -48,7 +49,7 @@ func doGui() {
 	group1.NewButton("dump repo.Control", func() {
 		// log.Info("CONTROL:", me.repo.Control)
 		for v := range me.repo.Control {
-			log.Info("CONTROL:", v, me.repo.Control[v])
+			log.Infof("CONTROL: %s: %s\n", v, me.repo.Control[v])
 		}
 	})
 
@@ -65,3 +66,73 @@ func doGui() {
 
 	win.Show()
 }
+
+// This initializes the control box
+func newControl(parent *gui.Node) *controlBox {
+	var c *controlBox
+	c = new(controlBox)
+	c.group = parent.NewGroup("choices")
+	c.grid = c.group.NewGrid("gridiron", 8, 1)
+
+	c.Package = gadgets.NewOneLiner(c.grid, "Package")
+	c.grid.NextRow()
+
+	c.Source = gadgets.NewOneLiner(c.grid, "Source")
+	c.grid.NextRow()
+
+	c.Version = gadgets.NewOneLiner(c.grid, "Version")
+	c.grid.NextRow()
+
+	c.Architecture = gadgets.NewBasicDropdown(c.grid, "Architecture")
+	c.Architecture.AddText("all")
+	c.Architecture.AddText("riscv64")
+	c.Architecture.AddText("amd64")
+	c.Architecture.AddText("arm64")
+	c.Architecture.AddText("ppc64")
+	c.Architecture.AddText("i386")
+	c.Architecture.AddText("sparc64")
+	c.Architecture.AddText("alpha")
+	c.Architecture.SetText("riscv64")
+	c.grid.NextRow()
+
+	c.InstallPath = gadgets.NewBasicCombobox(c.grid, "Install Path")
+	c.InstallPath.AddText("/usr/bin")
+	c.InstallPath.AddText("/usr/local/bin")
+	c.InstallPath.AddText("/bin")
+	c.InstallPath.AddText("/opt/<pkg>/bin")
+	c.InstallPath.SetText("/usr/bin")
+	c.grid.NextRow()
+
+	c.Maintainer = gadgets.NewOneLiner(c.grid, "Maintainer")
+	c.grid.NextRow()
+
+	c.Packager = gadgets.NewBasicEntry(c.grid, "Packager")
+	c.grid.NextRow()
+
+	c.GoPath = gadgets.NewBasicEntry(c.grid, "GoPath")
+	c.grid.NextRow()
+
+	c.Namespace = gadgets.NewBasicEntry(c.grid, "Namespace")
+	c.grid.NextRow()
+
+	c.URL = gadgets.NewBasicEntry(c.grid, "URL")
+	c.grid.NextRow()
+
+	c.Depends = gadgets.NewOneLiner(c.grid, "Depends")
+	c.grid.NextRow()
+
+	c.BuildDepends = gadgets.NewOneLiner(c.grid, "Build-Depends")
+	c.grid.NextRow()
+
+	c.Recommends = gadgets.NewOneLiner(c.grid, "Recommends")
+	c.grid.NextRow()
+
+	c.Conflicts = gadgets.NewBasicEntry(c.grid, "Conflicts")
+	c.grid.NextRow()
+
+	c.Description = gadgets.NewOneLiner(c.grid, "Description")
+	c.Description.SetText("na")
+	c.grid.NextRow()
+
+	return c
+}
diff --git a/update.go b/update.go
new file mode 100644
index 0000000..2ae8ae9
--- /dev/null
+++ b/update.go
@@ -0,0 +1,17 @@
+package main
+
+func updateControl(c *controlBox) {
+	c.Namespace.SetText(me.repo.Namespace)
+	c.URL.SetText(me.repo.URL)
+	c.Package.SetText(me.repo.Control["Package"])
+	c.Source.SetText(me.repo.Control["Package"])
+	c.Maintainer.SetText(me.repo.Control["Maintainer"])
+	c.Packager.SetText(me.repo.Control["Packager"])
+	c.Version.SetText(me.repo.GetCurrentVersion())
+	c.Description.SetText(me.repo.Control["Description"])
+	c.Depends.SetText(me.repo.Control["Depends"])
+	c.Package.SetText(me.repo.Control["Package"])
+	c.Recommends.SetText(me.repo.Control["Recommends"])
+
+	c.Architecture.SetText("amd64")
+}
diff --git a/windowControlBox.go b/windowControlBox.go
deleted file mode 100644
index 467a846..0000000
--- a/windowControlBox.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package main
-
-import (
-	"go.wit.com/gui"
-	"go.wit.com/lib/gadgets"
-)
-
-// This initializes the control box
-func newControl(parent *gui.Node) *controlBox {
-	var c *controlBox
-	c = new(controlBox)
-	c.group = parent.NewGroup("choices")
-	c.grid = c.group.NewGrid("gridiron", 8, 1)
-
-	c.Package = gadgets.NewOneLiner(c.grid, "Package")
-	c.grid.NextRow()
-
-	c.Source = gadgets.NewOneLiner(c.grid, "Source")
-	c.grid.NextRow()
-
-	c.Version = gadgets.NewOneLiner(c.grid, "Version")
-	c.grid.NextRow()
-
-	c.Architecture = gadgets.NewBasicDropdown(c.grid, "Architecture")
-	c.Architecture.AddText("all")
-	c.Architecture.AddText("riscv64")
-	c.Architecture.AddText("amd64")
-	c.Architecture.AddText("arm64")
-	c.Architecture.AddText("ppc64")
-	c.Architecture.AddText("i386")
-	c.Architecture.AddText("sparc64")
-	c.Architecture.AddText("alpha")
-	c.Architecture.SetText("riscv64")
-	c.grid.NextRow()
-
-	c.InstallPath = gadgets.NewBasicCombobox(c.grid, "Install Path")
-	c.InstallPath.AddText("/usr/bin")
-	c.InstallPath.AddText("/usr/local/bin")
-	c.InstallPath.AddText("/bin")
-	c.InstallPath.AddText("/opt/<pkg>/bin")
-	c.InstallPath.SetText("/usr/bin")
-	c.grid.NextRow()
-
-	c.Maintainer = gadgets.NewOneLiner(c.grid, "Maintainer")
-	c.grid.NextRow()
-
-	c.Packager = gadgets.NewBasicEntry(c.grid, "Packager")
-	c.grid.NextRow()
-
-	c.GoPath = gadgets.NewBasicEntry(c.grid, "GoPath")
-	c.grid.NextRow()
-
-	c.Namespace = gadgets.NewBasicEntry(c.grid, "Namespace")
-	c.grid.NextRow()
-
-	c.URL = gadgets.NewBasicEntry(c.grid, "URL")
-	c.grid.NextRow()
-
-	c.Depends = gadgets.NewOneLiner(c.grid, "Depends")
-	c.grid.NextRow()
-
-	c.BuildDepends = gadgets.NewOneLiner(c.grid, "Build-Depends")
-	c.grid.NextRow()
-
-	c.Recommends = gadgets.NewOneLiner(c.grid, "Recommends")
-	c.grid.NextRow()
-
-	c.Conflicts = gadgets.NewBasicEntry(c.grid, "Conflicts")
-	c.grid.NextRow()
-
-	c.Description = gadgets.NewOneLiner(c.grid, "Description")
-	c.grid.NextRow()
-
-	return c
-}
-
-func updateControl(c *controlBox) {
-	c.Namespace.SetText(me.repo.Namespace)
-	c.URL.SetText(me.repo.URL)
-}