diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | files/repomap | 52 | ||||
| -rw-r--r-- | indexHtml.go | 53 | ||||
| -rw-r--r-- | main.go | 6 |
4 files changed, 58 insertions, 54 deletions
@@ -1,4 +1,5 @@ all: + git pull echo "build it!" # GO111MODULE=off go get -u -v . GO111MODULE=off go build -v -x diff --git a/files/repomap b/files/repomap index 84ec168..20bc093 100644 --- a/files/repomap +++ b/files/repomap @@ -1,22 +1,35 @@ -# log/ (needed for the gui) +# gui core packages -go.wit.com/log git.wit.org/wit/log +go.wit.com/gui git.wit.org/gui/gui The GUI API +go.wit.com/widget git.wit.org/gui/widget Definitions for Buttons, Texcboxes, etc. -# gui core packages +# Applications -go.wit.com/widget git.wit.org/gui/widget -go.wit.com/gui git.wit.org/gui/gui +go.wit.com/apps/helloworld git.wit.org/gui/helloworld A simple Demo +go.wit.com/apps/basicwindow git.wit.org/jcarr/basicwindow A bit more of a Demo +go.wit.com/apps/gadgetwindow git.wit.org/jcarr/gadgetwindow Useful for debugging toolkits +go.wit.com/apps/autotypist git.wit.org/jcarr/autotypist Used to maintain these repos +go.wit.com/apps/guireleaser git.wit.org/jcarr/guireleaser Used to do version released +go.wit.com/apps/control-panel-dns git.wit.org/jcarr/control-panel-dns A DNS Control Panel +go.wit.com/apps/control-panel-digitalocean git.wit.org/wit/control-panel-digitalocean A simple Digital Ocean Control Panel +go.wit.com/apps/control-panel-cloudflare git.wit.org/wit/control-panel-cloudflare +go.wit.com/apps/control-panel-vpn git.wit.org/jcarr/control-panel-vpn +go.wit.com/apps/go.wit.com git.wit.org/jcarr/go.wit.com # gui toolkit packages -go.wit.com/toolkits/tree git.wit.org/toolkits/tree -go.wit.com/toolkits/nocui git.wit.org/toolkits/nocui -go.wit.com/toolkits/gocui git.wit.org/toolkits/gocui -go.wit.com/toolkits/andlabs git.wit.org/toolkits/andlabs -go.wit.com/toolkits/debian git.wit.org/toolkits/debian +go.wit.com/toolkits/tree git.wit.org/toolkits/tree Common plugin code to talk to the GUI +go.wit.com/toolkits/nocui git.wit.org/toolkits/nocui A minimum toolkit plugin using STDIN/STDOUT +go.wit.com/toolkits/gocui git.wit.org/toolkits/gocui A gui plugin using 'gocui' +go.wit.com/toolkits/andlabs git.wit.org/toolkits/andlabs A gui plugin using andlabs/ui +go.wit.com/toolkits/debian git.wit.org/toolkits/debian packages the plugins for debian + +# log/ (modified for the gui) + +go.wit.com/log git.wit.org/wit/log a wrapper attempt around log for the GUI # gui libraries -go.wit.com/lib/gadgets git.wit.org/gui/gadgets -go.wit.com/lib/debugger git.wit.org/gui/debugger +go.wit.com/lib/gadgets git.wit.org/gui/gadgets Some common collections of widgets +go.wit.com/lib/debugger git.wit.org/gui/debugger An attempt at a debugger go.wit.com/lib/gui/repostatus git.wit.org/jcarr/repostatus go.wit.com/lib/gui/hostname git.wit.org/jcarr/hostname go.wit.com/lib/gui/linuxstatus git.wit.org/jcarr/hostname @@ -26,20 +39,7 @@ go.wit.com/lib/gui/cloudflare git.wit.org/gui/cloudflare go.wit.com/lib/gui/shell git.wit.org/wit/shell go.wit.com/lib/protobuf/wit git.wit.org/wit/witProtobuf -# Applications - -go.wit.com/apps/helloworld git.wit.org/gui/helloworld -go.wit.com/apps/basicwindow git.wit.org/jcarr/basicwindow -go.wit.com/apps/gadgetwindow git.wit.org/jcarr/gadgetwindow -go.wit.com/apps/autotypist git.wit.org/jcarr/autotypist -go.wit.com/apps/guireleaser git.wit.org/jcarr/guireleaser -go.wit.com/apps/control-panel-dns git.wit.org/jcarr/control-panel-dns -go.wit.com/apps/control-panel-digitalocean git.wit.org/wit/control-panel-digitalocean -go.wit.com/apps/control-panel-cloudflare git.wit.org/wit/control-panel-cloudflare -go.wit.com/apps/control-panel-vpn git.wit.org/jcarr/control-panel-vpn -go.wit.com/apps/go.wit.com git.wit.org/jcarr/go.wit.com - -# Support packages +# Support packages (forked for experiments) go.wit.com/dev/alexflint/arg git.wit.org/jcarr/go-arg go.wit.com/dev/alexflint/scalar git.wit.org/jcarr/go-scalar diff --git a/indexHtml.go b/indexHtml.go index a00ef10..a809229 100644 --- a/indexHtml.go +++ b/indexHtml.go @@ -6,8 +6,6 @@ import ( "strconv" "strings" "time" - - "go.wit.com/log" ) func indexHeader(w http.ResponseWriter) { @@ -38,14 +36,14 @@ func indexBodyStart(w http.ResponseWriter) { fmt.Fprintln(w, " <table class=\"u-full-width\">") // fmt.Fprintln(w, " <thead>") fmt.Fprintln(w, " <tr>") - fmt.Fprintln(w, " <th>Package</th>") + fmt.Fprintln(w, " <th>Package (IPv6 only)</th>") fmt.Fprintln(w, " <th>Version</th>") fmt.Fprintln(w, " <th>Age</th>") fmt.Fprintln(w, " <th>Dev Version</th>") - fmt.Fprintln(w, " <th>go get</th>") - fmt.Fprintln(w, " <th>Authoritative sources (IPv6 only)</th>") - fmt.Fprintln(w, " <th></th>") - fmt.Fprintln(w, " <th>Documentation</th>") + fmt.Fprintln(w, " <th>Description</th>") + // fmt.Fprintln(w, " <th>Authoritative sources (IPv6 only)</th>") + // fmt.Fprintln(w, " <th></th>") + fmt.Fprintln(w, " <th>GO Docs</th>") fmt.Fprintln(w, " </tr>") // fmt.Fprintln(w, " </thead>") fmt.Fprintln(w, " <tbody>") @@ -58,7 +56,7 @@ func insertHTMLnote(w http.ResponseWriter, i int, parts []string) { } func indexBodyScanConfig(w http.ResponseWriter) { - log.Info("indexBodyScanConfig() START") + // log.Info("indexBodyScanConfig() START") for i, line := range configfile { // log.Info("config file line:", i, line) fields := strings.Fields(line) @@ -71,24 +69,34 @@ func indexBodyScanConfig(w http.ResponseWriter) { continue } if len(fields) == 2 { - log.Info("short file line:", i, line) + // log.Info("short file line:", i, line) gourl := fields[0] giturl := fields[1] indexBodyRepo(w, gourl, giturl, "") continue } - log.Info("config file line:", i, line) + if len(fields) > 2 { + // log.Info("short file line:", i, line) + gourl := fields[0] + giturl := fields[1] + desc := strings.Join(fields[2:], " ") + desc = strings.TrimSpace(desc) + indexBodyRepo(w, gourl, giturl, desc) + continue + } + // log.Info("config file line:", i, line) } - log.Info("indexBodyScanConfig() END") + // log.Info("indexBodyScanConfig() END") } -func indexBodyRepo(w http.ResponseWriter, gourl string, giturl string, github string) { +func indexBodyRepo(w http.ResponseWriter, gourl string, giturl string, desc string) { // fmt.Fprintln(w, " <tr> <td><h5>log/ (needed for the gui)</h5></td> <td></td> <td></td> <td></td> <td></td> </tr>") fmt.Fprintln(w, " <tr>") - fmt.Fprintln(w, " <td>"+gourl+"</td>") - for i, s := range versionMap { - log.Println("found i =", i, "with", "s =", s) - } + // fmt.Fprintln(w, " <td>"+gourl+"</td>") + fmt.Fprintln(w, " <td> <a href=\"//"+gourl+"\">"+gourl+"</a></td>") + // for i, s := range versionMap { + // log.Println("found i =", i, "with", "s =", s) + // } var vtime, version string gourl = strings.TrimSpace(gourl) tmp, _ := versionMap[gourl] @@ -117,16 +125,11 @@ func indexBodyRepo(w http.ResponseWriter, gourl string, giturl string, github st } fmt.Fprintln(w, " <td>"+version+"</td>") // version - fmt.Fprintln(w, " <td>"+ vtime +"</td>") // dev version + fmt.Fprintln(w, " <td>"+vtime+"</td>") // dev version fmt.Fprintln(w, " <td></td>") // dev version - fmt.Fprintln(w, " <td> <a href=\"//"+gourl+"\">"+gourl+"</a></td>") - fmt.Fprintln(w, " <td> <a href=\"//"+gourl+"\">"+giturl+"</a></td>") - if github == "" { - fmt.Fprintln(w, " <td></td>") - } else { - fmt.Fprintln(w, " <td> <a href=\"//github.com/wit-go/log\">github.com/wit-go/log</a></td>") - } - fmt.Fprintln(w, " <td> <a href=\"//pkg.go.dev/"+gourl+"\"> <img src=\"goReference.svg\" alt=\"pkg.go.dev docs\" /> </a> </td>") + fmt.Fprintln(w, " <td>"+desc+"</td>") + // fmt.Fprintln(w, " <td> <a href=\"//"+gourl+"\">"+giturl+"</a></td>") + fmt.Fprintln(w, " <td> <a href=\"//pkg.go.dev/"+gourl+"\"> <img src=\"goReference.svg\" alt=\"pkg.go.dev\" /> </a> </td>") fmt.Fprintln(w, " </tr>") fmt.Fprintln(w, "") } @@ -112,9 +112,9 @@ func main() { readconfigfile() readVersionFile() - for i, s := range versionMap { - log.Println("found i =", i, "with", "s =", s) - } + // for i, s := range versionMap { + // log.Println("found i =", i, "with", "s =", s) + // } log.Println("found log =", versionMap["go.wit.com/log"]) http.HandleFunc("/", okHandler) go https() |