kayos
/
ziggs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feat: launch multiple commands inline concurrently and synchronously (bash-like, &&, &, ;) 

plus other stuff prolly
This commit is contained in:
kayos@tcp.direct 2023-06-04 05:13:50 -07:00
parent aca5f81f3b
commit 1cdb1c33cb
Signed by: kayos
GPG Key ID: 4B841471B4BEE979
15 changed files with 187 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -19,7 +19,7 @@ require (
github.com/muesli/termenv v0.15.1
github.com/rs/zerolog v1.29.1
github.com/spf13/viper v1.15.0
github.com/yunginnanet/huego v1.2.2-0.20230529010539-d408ab817fd4
github.com/yunginnanet/huego v1.2.2-0.20230529014403-8b8a50edf010
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35
golang.org/x/crypto v0.9.0
golang.org/x/net v0.10.0

4
go.sum
View File

@ -438,8 +438,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yunginnanet/huego v1.2.2-0.20230529010539-d408ab817fd4 h1:ygkYBx4P1MZPuCLpCf4tVCGroemO5vLGpukwsOi5aQU=
github.com/yunginnanet/huego v1.2.2-0.20230529010539-d408ab817fd4/go.mod h1:geoV/kOgrqHaEeT2QdOfqrvyTNSLs9JVN6Wzsk5zss0=
github.com/yunginnanet/huego v1.2.2-0.20230529014403-8b8a50edf010 h1:hZYdjxY9hM/8e82rv8x0C56prvoBjLNWJToytTtxMEc=
github.com/yunginnanet/huego v1.2.2-0.20230529014403-8b8a50edf010/go.mod h1:geoV/kOgrqHaEeT2QdOfqrvyTNSLs9JVN6Wzsk5zss0=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=

107
internal/cli/cli.go
View File

@ -7,11 +7,10 @@ import (
"os"
"path/filepath"
"strings"
"sync"
"time"
cli "git.tcp.direct/Mirrors/go-prompt"
"github.com/davecgh/go-spew/spew"
tui "github.com/manifoldco/promptui"
"github.com/rs/zerolog"
"github.com/google/shlex"
@ -30,7 +29,16 @@ var (
var noHist = map[string]bool{"clear": true, "exit": true, "quit": true}
// Interpret is where we will actuall define our Commands
func executor(cmd string) {
func Executor(cmd string) {
if log == nil {
log = config.StartLogger()
}
log.Trace().Caller().Msg("getting readlock for suggestions")
SuggestionMutex.RLock()
defer SuggestionMutex.RUnlock()
log.Trace().Caller().Msg("got readlock for suggestions")
var status = 0
defer func() {
if r := recover(); r != nil {
@ -76,7 +84,7 @@ func executor(cmd string) {
}
sel.Bridge = args[1]
log.Info().Str("host", br.Host).Int("lights", len(br.HueLights)).Msg("switched to bridge: " + sel.Bridge)
return
case "debug":
levelsdebug := map[string]zerolog.Level{"info": zerolog.InfoLevel, "debug": zerolog.DebugLevel, "trace": zerolog.TraceLevel}
debuglevels := map[zerolog.Level]string{zerolog.InfoLevel: "info", zerolog.DebugLevel: "debug", zerolog.TraceLevel: "trace"}
@ -94,8 +102,8 @@ func executor(cmd string) {
log.Info().Msg("disabled cli debug")
} else {
extraDebug = true
log.Info().Msgf("dumping suggestions")
spew.Dump(suggestions)
/* log.Info().Msgf("dumping suggestions")
spew.Dump(suggestions)*/
log.Info().Msg("enabled cli debug")
}
return
@ -109,43 +117,61 @@ func executor(cmd string) {
getHelp(args[len(args)-1])
case "clear":
print("\033[H\033[2J")
return
default:
if len(args) == 0 {
return
}
bcmd, ok := Commands[args[0]]
if !ok {
log.Error().Msg("invalid command: " + args[0])
status = 1
return
complete := strings.Join(args, " ")
log.Trace().Caller().Msgf("complete command: %s", complete)
if strings.Contains(complete, "&&") {
log.Warn().Caller().Msgf("found \"&&\" in command: %s, replacing with \";\"", complete)
strings.ReplaceAll(complete, "&&", ";")
}
sep := strings.Split(complete, "&")
log.Trace().Caller().Msgf("sep: %+s", sep)
br, ok := ziggy.Lucifer.Bridges[sel.Bridge]
if sel.Bridge == "" || !ok {
q := tui.Select{
Label: "Send to all known bridges?",
Items: []string{"yes", "no"},
Pointer: common.ZiggsPointer,
for _, b := range ziggy.Lucifer.Bridges {
br = ziggy.Lucifer.Bridges[b.Info.IPAddress]
break
}
_, ch, _ := q.Run()
if ch != "yes" {
return
}
for _, br := range ziggy.Lucifer.Bridges {
go func(brj *ziggy.Bridge) {
err := bcmd.reactor(brj, args[1:])
if err != nil {
log.Error().Err(err).Msg("bridge command failed")
}
}(br)
}
return
}
err := bcmd.reactor(br, args[1:])
if err != nil {
log.Error().Err(err).Msg("error executing command")
status = 1
wg := &sync.WaitGroup{}
for _, cm := range sep {
cm = strings.TrimSpace(cm)
log.Trace().Caller().Msgf("executing command: %s", cm)
wg.Add(1)
go func(c string) {
c = strings.TrimSpace(c)
defer wg.Done()
for _, synchro := range strings.Split(c, ";") {
synchro = strings.TrimSpace(synchro)
myArgs := strings.Split(synchro, " ")
bcmd, myok := Commands[myArgs[0]]
if !myok {
log.Error().Msg("invalid command: " + myArgs[0])
status = 1
return
}
log.Trace().Caller().Msgf("selected bridge: %s", sel.Bridge)
if e := bcmd.reactor(br, myArgs[1:]); e != nil {
log.Error().Msgf("error executing command: %s", e)
status = 1
return
}
}
}(cm)
}
wg.Wait()
}
}
@ -204,7 +230,7 @@ func loadHist() {
continue
default:
histMap[strings.TrimSpace(xerox.Text())] = true
history = append(history, xerox.Text())
history = append(history, strings.ReplaceAll(xerox.Text(), "_POUNDSIGN_", "#"))
}
}
histLoaded = true
@ -224,18 +250,10 @@ func saveHist() {
// func StartCLI(r io.Reader, w io.Writer) {
func StartCLI() {
log = config.GetLogger()
processBridges()
go func() {
processGroups(ziggy.GetGroupMap())
processLights(ziggy.GetLightMap())
processScenes(ziggy.GetSceneMap())
}()
buildTime, _ := common.Version()
ct, _ := common.Version()
// cli.NewStdoutWriter().
prompt = cli.New(
executor,
Executor,
completer,
// cli.OptionWriter(w),
// cli.Op(r),
@ -255,7 +273,8 @@ func StartCLI() {
}
return fmt.Sprintf("ziggs[%s] %s ", sel.String(), bulb), true
}),
cli.OptionTitle("ziggs - built "+buildTime),
cli.OptionTitle("ziggs - built "+ct),
)
prompt.Run()

29
internal/cli/commands.go
View File

@ -11,8 +11,8 @@ import (
"strings"
"time"
"github.com/yunginnanet/huego"
"github.com/davecgh/go-spew/spew"
"github.com/yunginnanet/huego"
"git.tcp.direct/kayos/ziggs/internal/ziggy"
)
@ -85,7 +85,7 @@ func cmdScenes(br *ziggy.Bridge, args []string) error {
for _, scene := range scenes {
log.Info().Str("caller", strings.Split(br.Host, "://")[1]).
Str("ID", scene.ID).Msgf("Scene: %s", scene.Name)
log.Trace().Msgf("%v", spew.Sprint(scene))
log.Trace().Caller().Msgf("%v", spew.Sprint(scene))
}
return nil
}
@ -95,7 +95,7 @@ func cmdLights(br *ziggy.Bridge, args []string) error {
log.Info().
Str("caller", strings.Split(br.Host, "://")[1]).Int("ID", l.ID).Str("type", l.ProductName).
Str("model", l.ModelID).Bool("on", l.IsOn()).Msgf("Light: %s", name)
log.Trace().Msgf("%v", spew.Sprint(l))
log.Trace().Caller().Msgf("%v", spew.Sprint(l))
}
return nil
}
@ -111,7 +111,7 @@ func cmdRules(br *ziggy.Bridge, args []string) error {
for _, r := range rules {
log.Info().Str("caller", strings.Split(br.Host, "://")[1]).Int("ID", r.ID).
Str("status", r.Status).Msgf("Rule: %s", r.Name)
log.Trace().Msgf("%v", spew.Sprint(r))
log.Trace().Caller().Msgf("%v", spew.Sprint(r))
}
return nil
}
@ -127,7 +127,7 @@ func cmdSchedules(br *ziggy.Bridge, args []string) error {
for _, s := range schedules {
log.Info().Str("caller", strings.Split(br.Host, "://")[1]).Int("ID", s.ID).
Str("desc", s.Description).Msgf("Schedule: %s", s.Name)
log.Trace().Msgf("%v", spew.Sprint(s))
log.Trace().Caller().Msgf("%v", spew.Sprint(s))
}
return nil
}
@ -143,7 +143,7 @@ func cmdSensors(br *ziggy.Bridge, args []string) error {
for _, s := range sensors {
log.Info().Str("caller", strings.Split(br.Host, "://")[1]).Int("ID", s.ID).
Str("type", s.Type).Msgf("Sensor: %s", s.Name)
log.Trace().Msgf("%v", spew.Sprint(s))
log.Trace().Caller().Msgf("%v", spew.Sprint(s))
}
return nil
}
@ -166,7 +166,7 @@ func cmdGroups(br *ziggy.Bridge, args []string) error {
}
log.Info().Msg("\t[" + strconv.Itoa(lght.ID) + "] " + lght.Name + " (" + lght.ProductName + ")")
}
log.Trace().Msgf("%v", spew.Sprint(g))
log.Trace().Caller().Msgf("%v", spew.Sprint(g))
}
return nil
}
@ -252,7 +252,7 @@ func cmdCp(br *ziggy.Bridge, args []string) error {
return err
}
log.Info().Msgf("updated group %s to include light %s", targetGroup.Name, targetLight.Name)
log.Trace().Msgf("%v", spew.Sprint(resp))
log.Trace().Caller().Msgf("%v", spew.Sprint(resp))
return nil
}
@ -373,6 +373,17 @@ func cmdDump(br *ziggy.Bridge, args []string) error {
return nil
}
func cmdGetFullState(br *ziggy.Bridge, args []string) error {
var err error
var fullstate map[string]interface{}
fullstate, err = br.GetFullState()
if err != nil {
return err
}
spew.Dump(fullstate)
return nil
}
// cmdLoad imports a target JSON object and attempts to apply it to an existing object
func cmdLoad(br *ziggy.Bridge, args []string) error {
var js []byte
@ -490,7 +501,7 @@ func cmdAdopt(br *ziggy.Bridge, args []string) error {
}
for _, l := range newLights.Lights {
log.Info().Msgf("[+] %s", l)
log.Trace().Msgf("%v", spew.Sprint(l))
log.Trace().Caller().Msgf("%v", spew.Sprint(l))
}
return nil
}

26
internal/cli/completer.go
View File

@ -1,12 +1,16 @@
package cli
import (
"fmt"
"strings"
"sync"
"time"
cli "git.tcp.direct/Mirrors/go-prompt"
"github.com/davecgh/go-spew/spew"
"github.com/google/shlex"
"git.tcp.direct/kayos/ziggs/internal/ziggy"
)
const (
@ -81,7 +85,7 @@ func (c completion) qualifies(line string) bool {
var (
suggestions map[int]map[string]*completion
suggestionMutex = &sync.RWMutex{}
SuggestionMutex = &sync.RWMutex{}
)
func init() {
@ -111,11 +115,23 @@ func init() {
Commands["info"] = newZiggsCommand(cmdInfo, "show information about a bridge", 0, "uname")
initCompletion()
Commands["reboot"] = newZiggsCommand(cmdReboot, "reboot bridge", 0)
Commands["get-full-state"] = newZiggsCommand(cmdGetFullState, "get full state from bridge", 0)
Commands["sleep"] = newZiggsCommand(func(br *ziggy.Bridge, args []string) error {
if len(args) < 1 {
return fmt.Errorf("sleep requires 1 argument")
}
d, err := time.ParseDuration(args[0])
if err != nil {
return err
}
time.Sleep(d)
return nil
}, "sleep for a specified number of seconds", 1)
}
func initCompletion() {
suggestionMutex.Lock()
defer suggestionMutex.Unlock()
SuggestionMutex.Lock()
defer SuggestionMutex.Unlock()
suggestions = make(map[int]map[string]*completion)
suggestions[0] = make(map[string]*completion)
@ -198,8 +214,8 @@ func completer(in cli.Document) []cli.Suggest {
log.Trace().Int("head", head).Msgf("completing %v", infields)
}
var sugs []cli.Suggest
suggestionMutex.RLock()
defer suggestionMutex.RUnlock()
SuggestionMutex.RLock()
defer SuggestionMutex.RUnlock()
for _, sug := range suggestions[head] {
if !sug.qualifies(c) {
continue

6
internal/cli/cpu.go
View File

@ -5,8 +5,8 @@ import (
"strconv"
"time"
"github.com/yunginnanet/huego"
"github.com/lucasb-eyer/go-colorful"
"github.com/yunginnanet/huego"
"git.tcp.direct/kayos/ziggs/internal/common"
"git.tcp.direct/kayos/ziggs/internal/system"
@ -65,7 +65,7 @@ func cpuInit(argVal string, bridge *ziggy.Bridge, cpuTarget cmdTarget) error {
continue
}
cpuLastCol = clr.Hex()
log.Trace().Msgf("CPU load color: %v", clr.Hex())
log.Trace().Caller().Msgf("CPU load color: %v", clr.Hex())
cHex, cErr := common.ParseHexColorFast(clr.Hex())
if cErr != nil {
log.Error().Err(cErr).Msg("failed to parse color")
@ -87,7 +87,7 @@ func cpuInit(argVal string, bridge *ziggy.Bridge, cpuTarget cmdTarget) error {
}
time.Sleep(750 * time.Millisecond)
cpuLastHue[head] = hue
// log.Trace().Msgf("CPU load hue: %v", hue)
// log.Trace().Caller().Msgf("CPU load hue: %v", hue)
target := lights[head]
newh := 65000 - hue
if newh < 1 {

23
internal/cli/create.go
View File

@ -23,6 +23,7 @@ func cmdCreate(br *ziggy.Bridge, args []string) error {
class = ""
)
log.Debug().Msgf("creating group: %s", name)
for i, arg := range args {
switch arg {
case "group", name:
@ -34,19 +35,37 @@ func cmdCreate(br *ziggy.Bridge, args []string) error {
log.Debug().Msgf("group class: %s", class)
continue
}
var seenMap = make(map[string]bool)
if strings.Contains(arg, ",") {
log.Debug().Msgf("found comma in arg %d, splitting argument by commas and remaking arg list", i)
args = append(args[:i], strings.Split(arg, ",")...)
log.Debug().Msgf("new args: %v", args)
var newIDs []string
newIDs = append(newIDs, strings.Split(arg, ",")...)
log.Debug().Msgf("new args: %v", newIDs)
for _, newArg := range newIDs {
if _, err := strconv.Atoi(newArg); err != nil {
return err
}
if seenMap[newArg] {
continue
}
seenMap[newArg] = true
ids = append(ids, newArg)
}
continue
}
if seenMap[arg] {
continue
}
seenMap[arg] = true
_, err := strconv.Atoi(arg)
if err != nil {
return err
}
log.Trace().Caller().Msgf("found light id: %s", arg)
ids = append(ids, arg)
}
log.Debug().Msgf("light ids: %+s", ids)
resp, err := br.CreateGroup(huego.Group{Name: name, Lights: ids, Type: groupType, Class: class})
if err != nil {
return err

6
internal/cli/help.go
View File

@ -10,8 +10,8 @@ import (
var tabber = tabwriter.NewWriter(os.Stdout, 0, 8, 1, '\t', tabwriter.AlignRight)
func getHelp(target string) {
suggestionMutex.RLock()
defer suggestionMutex.RUnlock()
SuggestionMutex.RLock()
defer SuggestionMutex.RUnlock()
if target != "" && target != "meta" {
for _, su := range suggestions[0] {
@ -31,7 +31,7 @@ func getHelp(target string) {
if su.inner.isAlias || su.isAlias {
su.isAlias = true
if extraDebug {
log.Trace().Msgf("alias: %s", su.Text)
log.Trace().Caller().Msgf("alias: %s", su.Text)
}
}
}

39
internal/cli/process.go
View File

@ -3,16 +3,24 @@ package cli
import (
cli "git.tcp.direct/Mirrors/go-prompt"
"git.tcp.direct/kayos/ziggs/internal/config"
"git.tcp.direct/kayos/ziggs/internal/ziggy"
)
func processGroups(grps map[string]*ziggy.HueGroup) {
func init() {
go func() {
log = config.GetLogger()
}()
}
func ProcessGroups(grps map[string]*ziggy.HueGroup) {
for grp, g := range grps {
log.Trace().Caller().Msgf("Processing group %s", grp)
suffix := ""
if g.Type != "" {
suffix = " (" + g.Type + ")"
}
suggestionMutex.Lock()
SuggestionMutex.Lock()
suggestions[2][grp] = &completion{
Suggest: cli.Suggest{
Text: grp,
@ -24,17 +32,18 @@ func processGroups(grps map[string]*ziggy.HueGroup) {
},
root: false,
}
suggestionMutex.Unlock()
SuggestionMutex.Unlock()
}
}
func processScenes(scns map[string]*ziggy.HueScene) {
func ProcessScenes(scns map[string]*ziggy.HueScene) {
for scn, s := range scns {
log.Trace().Caller().Msgf("Processing scene %s", scn)
suffix := ""
if s.Type != "" {
suffix = " (" + s.Type + ")"
}
suggestionMutex.Lock()
SuggestionMutex.Lock()
suggestions[4][scn] = &completion{
Suggest: cli.Suggest{
Text: scn,
@ -47,7 +56,7 @@ func processScenes(scns map[string]*ziggy.HueScene) {
},
callback: func(args []string) bool {
if extraDebug {
log.Trace().Msgf("Checking if scene %s belongs to group %s, their group is %s",
log.Trace().Caller().Msgf("Checking if scene %s belongs to group %s, their group is %s",
s.Name, args[3], s.Group)
}
if len(args) < 4 {
@ -61,7 +70,7 @@ func processScenes(scns map[string]*ziggy.HueScene) {
return false
case args[1] == "group" || args[1] == "g":
if extraDebug {
log.Trace().Msgf("Checking if group %s is %s", args[3], s.Group)
log.Trace().Caller().Msgf("Checking if group %s is %s", args[3], s.Group)
}
if args[3] == s.Group {
return true
@ -73,17 +82,18 @@ func processScenes(scns map[string]*ziggy.HueScene) {
},
root: false,
}
suggestionMutex.Unlock()
SuggestionMutex.Unlock()
}
}
func processLights(lghts map[string]*ziggy.HueLight) {
func ProcessLights(lghts map[string]*ziggy.HueLight) {
for lt, l := range lghts {
log.Trace().Caller().Msgf("Processing light %s", lt)
suffix := ""
if l.Type != "" {
suffix = " (" + l.Type + ")"
}
suggestionMutex.Lock()
SuggestionMutex.Lock()
suggestions[2][lt] = &completion{
Suggest: cli.Suggest{
Text: lt,
@ -95,13 +105,14 @@ func processLights(lghts map[string]*ziggy.HueLight) {
},
root: false,
}
suggestionMutex.Unlock()
SuggestionMutex.Unlock()
}
}
func processBridges() {
func ProcessBridges() {
for brd, b := range ziggy.Lucifer.Bridges {
suggestionMutex.Lock()
log.Trace().Caller().Msgf("Processing bridge %s", brd)
SuggestionMutex.Lock()
suggestions[1]["bridge"] = &completion{
Suggest: cli.Suggest{
Text: brd,
@ -110,6 +121,6 @@ func processBridges() {
requires: map[int]map[string]bool{0: {"use": true, "u": true}},
root: false,
}
suggestionMutex.Unlock()
SuggestionMutex.Unlock()
}
}

6
internal/cli/set.go
View File

@ -264,9 +264,9 @@ func cmdSet(bridge *ziggy.Bridge, args []string) error {
default:
return errors.New("unknown target")
}
log.Trace().Msgf("current state: %v", currentState)
log.Trace().Caller().Msgf("current state: %v", currentState)
for d, act := range actions {
log.Trace().Msgf("running action %d", d)
log.Trace().Caller().Msgf("running action %d", d)
err := act()
if err != nil {
return err
@ -277,7 +277,7 @@ func cmdSet(bridge *ziggy.Bridge, args []string) error {
case tlok:
currentState = tl.State
}
log.Trace().Msgf("new state: %v", currentState)
log.Trace().Caller().Msgf("new state: %v", currentState)
}
return nil
}

4
internal/cli/update.go
View File

@ -5,8 +5,8 @@ import (
"strings"
"time"
"github.com/yunginnanet/huego"
"github.com/davecgh/go-spew/spew"
"github.com/yunginnanet/huego"
"git.tcp.direct/kayos/ziggs/internal/ziggy"
)
@ -44,7 +44,7 @@ func cmdFirmwareUpdate(br *ziggy.Bridge, args []string) error {
if err != nil {
return err
}
log.Trace().Msgf("new bridge update state:\n%s", spew.Sdump(cNew.SwUpdate2))
log.Trace().Caller().Msgf("new bridge update state:\n%s", spew.Sdump(cNew.SwUpdate2))
log.Info().Msgf("New software version: %s", c.SwVersion)
log.Info().Msgf("New update state: %v", c.SwUpdate2.State)
return err

2
internal/config/config.go
View File

@ -92,7 +92,7 @@ func setDefaults() {
Opt := make(map[string]map[string]interface{})
Opt["logger"] = map[string]interface{}{
"debug": true,
"trace": true,
"trace": false,
"directory": deflogdir,
"nocolor": defNoColor,
"use_date_filename": true,

4
internal/ziggy/lights.go
View File

@ -11,9 +11,9 @@ import (
"sync"
"git.tcp.direct/kayos/common/entropy"
"github.com/yunginnanet/huego"
tui "github.com/manifoldco/promptui"
"github.com/rs/zerolog"
"github.com/yunginnanet/huego"
"golang.org/x/net/proxy"
"git.tcp.direct/kayos/ziggs/internal/common"
@ -148,7 +148,7 @@ func GetControllers(bridges []config.KnownBridge) (br []*Bridge) {
log.Error().Str("caller", lightConfig.Hostname).Err(err).Msg("unsuccessful connection")
continue
}
c.Log().Info().Str("caller", strings.Split(lightConfig.Hostname, "http://")[1]).Msg("connected")
c.Log().Debug().Str("caller", strings.Split(lightConfig.Hostname, "http://")[1]).Msg("connected")
br = append(br, c)
}
return

6
internal/ziggy/scan.go
View File

@ -12,8 +12,8 @@ import (
"sync/atomic"
"time"
"github.com/yunginnanet/huego"
tui "github.com/manifoldco/promptui"
"github.com/yunginnanet/huego"
"go4.org/netipx"
"git.tcp.direct/kayos/ziggs/internal/common"
@ -110,7 +110,7 @@ func checkAddrs(ctx context.Context, addrs []net.Addr, working *int32, resChan c
var init = &sync.Once{}
log.Trace().Msg("checking addresses")
for _, a := range addrs {
log.Trace().Msgf("checking %s", a.String())
log.Trace().Caller().Msgf("checking %s", a.String())
rng := netipx.MustParseIPRange(a.String())
for ipa := rng.From(); ipa != rng.To(); ipa = ipa.Next() {
init.Do(func() { resChan <- &huego.Bridge{} })
@ -127,7 +127,7 @@ func checkAddrs(ctx context.Context, addrs []net.Addr, working *int32, resChan c
break ctxLoop
}
}
log.Trace().Msgf("checking %s", ipa.String())
log.Trace().Caller().Msgf("checking %s", ipa.String())
atomic.AddInt32(working, 1)
go func(ip netip.Addr) {
resChan <- enumerateBridge(ip, ctx)

23
main.go
View File

@ -10,9 +10,9 @@ import (
"time"
"git.tcp.direct/kayos/common/squish"
"github.com/yunginnanet/huego"
"github.com/manifoldco/promptui"
"github.com/rs/zerolog"
"github.com/yunginnanet/huego"
"git.tcp.direct/kayos/ziggs/internal/cli"
"git.tcp.direct/kayos/ziggs/internal/common"
@ -43,8 +43,8 @@ func aesthetic() {
if len(Version) > 18 {
index = 18
}
log.Info().Str("version", Version[:index]).Send()
log.Info().Str("built", compileTime).Send()
log.Debug().Str("version", Version[:index]).Send()
log.Debug().Str("built", compileTime).Send()
}
func init() {
@ -151,6 +151,14 @@ func main() {
log.Fatal().Err(err).Msg("failed to get bridges")
}
log = config.GetLogger()
cli.ProcessBridges()
go func() {
cli.ProcessGroups(ziggy.GetGroupMap())
cli.ProcessLights(ziggy.GetLightMap())
cli.ProcessScenes(ziggy.GetSceneMap())
}()
data.Start()
defer data.Close()
@ -158,7 +166,7 @@ func main() {
cli.StartCLI()
}
for _, arg := range os.Args {
for i, arg := range os.Args {
switch arg {
case "events":
evch := make(chan string, 10)
@ -171,6 +179,7 @@ func main() {
os.Stdout.WriteString("\n")
}
}()
evc := haptic.NewEventClient()
evc.Subscribe("*", evch)
if err = evc.Start(config.KnownBridges[0].Hostname, config.KnownBridges[0].Username); err != nil &&
@ -194,8 +203,7 @@ func main() {
log.Debug().Msg("executing " + arg)
if len(os.Args) < 2 {
for _, k := range Known {
ctx := context.TODO()
FindLights(ctx, k)
FindLights(context.TODO(), k)
}
}
case "shell":
@ -212,6 +220,9 @@ func main() {
sensptr = append(sensptr, &s)
}
selSensor(sensptr)
case "--":
log.Debug().Msg("executing " + strings.Join(os.Args[i+1:], " "))
cli.Executor(strings.Join(os.Args[i+1:], " "))
}
}