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

Add PrintfWithIndent function

Browse Source
This commit is contained in:
Ryan Cavicchioni
2021-02-16 20:20:18 -06:00
parent 01086e3c22
commit dd0bf763a3
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
cmd/show.go
View File

@@ -1,8 +1,13 @@
package lumecmd package lumecmd
import "fmt" import (
"fmt"
)
const Tabstop int = 2
func ShowCmd(args CmdArgs) (int, error) { func ShowCmd(args CmdArgs) (int, error) {
var indent int
c := args.Client c := args.Client
selector := args.Flags.String("selector") selector := args.Flags.String("selector")
lights, err := c.ListLights(selector) lights, err := c.ListLights(selector)
@@ -14,24 +19,26 @@ func ShowCmd(args CmdArgs) (int, error) {
sortLights(lights) sortLights(lights)
for i, l := range lights { for i, l := range lights {
indent = 0
fmt.Printf( fmt.Printf(
"Light ID: %s, %s, Power: %s\n", "Light ID: %s, %s, Power: %s\n",
l.Id, l.Id,
connected(l.Connected), connected(l.Connected),
powerColor(l.Power), powerColor(l.Power),
) )
fmt.Printf(" Label: %s, ID: %s\n", l.Label, l.Id) indent += Tabstop
fmt.Printf(" UUID: %s\n", l.UUID) PrintfWithIndent(indent, "Label: %s, ID: %s\n", l.Label, l.Id)
fmt.Printf(" Location: %s, ID: %s\n", l.Location.Name, l.Location.Id) PrintfWithIndent(indent, "UUID: %s\n", l.UUID)
fmt.Printf(" Group: %s, ID: %s\n", l.Group.Name, l.Group.Id) PrintfWithIndent(indent, "Location: %s, ID: %s\n", l.Location.Name, l.Location.Id)
fmt.Printf(" Color: Hue: %.1f, Saturation: %.1f%%, Kelvin: %d\n", PrintfWithIndent(indent, "Group: %s, ID: %s\n", l.Group.Name, l.Group.Id)
PrintfWithIndent(indent, "Color: Hue: %.1f, Saturation: %.1f%%, Kelvin: %d\n",
*l.Color.H, *l.Color.S, *l.Color.K) *l.Color.H, *l.Color.S, *l.Color.K)
fmt.Printf(" Brightness: %.1f%%\n", l.Brightness*100) PrintfWithIndent(indent, "Brightness: %.1f%%\n", l.Brightness*100)
if l.Effect != "" { if l.Effect != "" {
fmt.Printf(" Effect: %s\n", l.Effect) PrintfWithIndent(indent, "Effect: %s\n", l.Effect)
} }
fmt.Printf(" Product: %s\n", l.Product.Name) PrintfWithIndent(indent, "Product: %s\n", l.Product.Name)
fmt.Printf(" Capabilities: ") PrintfWithIndent(indent, "Capabilities: ")
fmt.Printf("Color: %s, ", YesNo(l.Product.Capabilities.HasColor)) fmt.Printf("Color: %s, ", YesNo(l.Product.Capabilities.HasColor))
fmt.Printf("Variable Color Temp: %s, ", YesNo(l.Product.Capabilities.HasVariableColorTemp)) fmt.Printf("Variable Color Temp: %s, ", YesNo(l.Product.Capabilities.HasVariableColorTemp))
fmt.Printf("IR: %s, ", YesNo(l.Product.Capabilities.HasIR)) fmt.Printf("IR: %s, ", YesNo(l.Product.Capabilities.HasIR))
@@ -41,14 +48,16 @@ func ShowCmd(args CmdArgs) (int, error) {
fmt.Printf("Max Kelvin: %.1f ", l.Product.Capabilities.MaxKelvin) fmt.Printf("Max Kelvin: %.1f ", l.Product.Capabilities.MaxKelvin)
fmt.Println() fmt.Println()
// List applicable selectors (most to least specific) // List applicable selectors (most to least specific)
fmt.Printf(" Selectors:\n") PrintfWithIndent(indent, "Selectors:\n")
fmt.Printf(" id:%s\n", l.Id) indent += Tabstop
fmt.Printf(" label:%s\n", l.Label) PrintfWithIndent(indent, "id:%s\n", l.Id)
fmt.Printf(" group_id:%s\n", l.Group.Id) PrintfWithIndent(indent, "label:%s\n", l.Label)
fmt.Printf(" group:%s\n", l.Group.Name) PrintfWithIndent(indent, "group_id:%s\n", l.Group.Id)
fmt.Printf(" location_id:%s\n", l.Location.Id) PrintfWithIndent(indent, "group:%s\n", l.Group.Name)
fmt.Printf(" location:%s\n", l.Location.Name) PrintfWithIndent(indent, "location_id:%s\n", l.Location.Id)
fmt.Printf(" Last Seen: %s (%.1fs ago)\n", l.LastSeen, l.SecondsLastSeen) PrintfWithIndent(indent, "location:%s\n", l.Location.Name)
indent -= Tabstop
PrintfWithIndent(indent, "Last Seen: %s (%.1fs ago)\n", l.LastSeen, l.SecondsLastSeen)
if i < len(lights)-1 { if i < len(lights)-1 {
fmt.Println() fmt.Println()

5
cmd/util.go
View File

@@ -170,3 +170,8 @@ func YesNo(v bool) string {
func PrintWithIndent(indent int, s string) { func PrintWithIndent(indent int, s string) {
fmt.Printf("%*s%s", indent, "", s) fmt.Printf("%*s%s", indent, "", s)
} }
func PrintfWithIndent(indent int, format string, a ...interface{}) (n int, err error) {
format = fmt.Sprintf("%*s%s", indent, "", format)
return fmt.Printf(format, a...)
}