ryanc/lume
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Make everything build strings instead of printing

Browse Source
This commit is contained in:
Ryan Cavicchioni
2021-04-23 22:56:58 +00:00
parent 8c9af693e7
commit dd1ea7c276
12 changed files with 121 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
cmd/print.go
View File

@ -2,7 +2,8 @@ package lumecmd
import (
"fmt"
"os"
"io"
"strings"
"time"
"git.kill0.net/chill9/lifx-go"
@ -11,8 +12,8 @@ import (
)
type Printer interface {
Results(results []lifx.Result)
Lights(lights []lifx.Light)
Results(results []lifx.Result) string
Lights(lights []lifx.Light) string
}
type defaultPrinter struct{}
@ -28,17 +29,19 @@ func NewPrinter(format string) Printer {
}
}
func (dp *defaultPrinter) Results(results []lifx.Result) {
func (dp *defaultPrinter) Results(results []lifx.Result) string {
var b strings.Builder
sortResults(results)
table := tablewriter.NewWriter(os.Stdout)
table := tablewriter.NewWriter(&b)
_, rows := makeResultsTable(results)
for _, v := range rows {
table.Append(v)
}
fmt.Printf("total %d\n", len(results))
fmt.Fprintf(&b, "total %d\n", len(results))
table.SetAlignment(tablewriter.ALIGN_LEFT)
table.SetAutoWrapText(false)
table.SetBorder(false)
@ -49,12 +52,16 @@ func (dp *defaultPrinter) Results(results []lifx.Result) {
table.SetRowSeparator("")
table.SetTablePadding(" ")
table.Render()
return b.String()
}
func (tp *tablePrinter) Results(results []lifx.Result) {
func (tp *tablePrinter) Results(results []lifx.Result) string {
var b strings.Builder
sortResults(results)
table := tablewriter.NewWriter(os.Stdout)
table := tablewriter.NewWriter(&b)
hdr, rows := makeResultsTable(results)
for _, v := range rows {
@ -63,19 +70,23 @@ func (tp *tablePrinter) Results(results []lifx.Result) {
table.SetHeader(hdr)
table.Render()
return b.String()
}
func (dp *defaultPrinter) Lights(lights []lifx.Light) {
func (dp *defaultPrinter) Lights(lights []lifx.Light) string {
var b strings.Builder
sortLights(lights)
table := tablewriter.NewWriter(os.Stdout)
table := tablewriter.NewWriter(&b)
_, rows := makeLightsTable(lights)
for _, v := range rows {
table.Append(v)
}
fmt.Printf("total %d\n", len(lights))
fmt.Fprintf(&b, "total %d\n", len(lights))
table.SetAlignment(tablewriter.ALIGN_LEFT)
table.SetAutoWrapText(false)
table.SetBorder(false)
@ -86,12 +97,16 @@ func (dp *defaultPrinter) Lights(lights []lifx.Light) {
table.SetRowSeparator("")
table.SetTablePadding(" ")
table.Render()
return b.String()
}
func (tp *tablePrinter) Lights(lights []lifx.Light) {
func (tp *tablePrinter) Lights(lights []lifx.Light) string {
var b strings.Builder
sortLights(lights)
table := tablewriter.NewWriter(os.Stdout)
table := tablewriter.NewWriter(&b)
hdr, rows := makeLightsTable(lights)
for _, v := range rows {
@ -100,6 +115,8 @@ func (tp *tablePrinter) Lights(lights []lifx.Light) {
table.SetHeader(hdr)
table.Render()
return b.String()
}
func ColorizeIndicator(s string) string {
@ -138,6 +155,11 @@ func PrintfWithIndent(indent int, format string, a ...interface{}) (n int, err e
return fmt.Printf(format, a...)
}
func FprintfWithIndent(w io.Writer, indent int, format string, a ...interface{}) (n int, err error) {
format = fmt.Sprintf("%*s%s", indent, "", format)
return fmt.Fprintf(w, format, a...)
}
func makeLightsTable(lights []lifx.Light) (hdr []string, rows [][]string) {
hdr = []string{"", "ID", "Location", "Group", "Label", "Last Seen", "Power"}