Use new changes in infinitime library to stop removing InfiniTime devices (Fixes #10 )

Fix itctl panic when itd is not running (Fixes #14 )
2022-04-16 04:28:53 -07:00 · 2022-04-02 15:20:31 -07:00
4 changed files with 10 additions and 4 deletions
--- a/cmd/itctl/main.go
+++ b/cmd/itctl/main.go
@@ -184,7 +184,10 @@ func main() {
 			return nil
 		},
 		After: func(*cli.Context) error {
-			return client.Close()
+			if client != nil {
+				client.Close()
+			}
+			return nil
 		},
 	}

--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 // indirect
 	github.com/urfave/cli/v2 v2.3.0
 	github.com/yuin/goldmark v1.4.4 // indirect
-	go.arsenm.dev/infinitime v0.0.0-20220304200437-7026da3f6f14
+	go.arsenm.dev/infinitime v0.0.0-20220416112421-b7a50271bece
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
 	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
 	golang.org/x/text v0.3.7
--- a/go.sum
+++ b/go.sum
@@ -200,8 +200,8 @@ github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.4 h1:zNWRjYUW32G9KirMXYHQHVNFkXvMI7LpgNW2AgYAoIs=
 github.com/yuin/goldmark v1.4.4/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
-go.arsenm.dev/infinitime v0.0.0-20220304200437-7026da3f6f14 h1:VCUKDxm7S+AS1wgP/eKsbvnvG2y/vMddZU3Ib8fAoOI=
-go.arsenm.dev/infinitime v0.0.0-20220304200437-7026da3f6f14/go.mod h1:Prvwx7Y2y8HsNRA1tPptduW9jzuw/JffmocvoHcDbYo=
+go.arsenm.dev/infinitime v0.0.0-20220416112421-b7a50271bece h1:ns/GMc4E8ZUZ9TEXhXgU4M+5sRaOLTFFoBWEJ67p3YM=
+go.arsenm.dev/infinitime v0.0.0-20220416112421-b7a50271bece/go.mod h1:Prvwx7Y2y8HsNRA1tPptduW9jzuw/JffmocvoHcDbYo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
--- a/main.go
+++ b/main.go
@@ -29,6 +29,7 @@ import (
 	"github.com/gen2brain/dlgs"
 	"github.com/knadh/koanf"
 	"github.com/mattn/go-isatty"
+	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
 )
@@ -64,6 +65,8 @@ func main() {
 		WhitelistEnabled: k.Bool("conn.whitelist.enabled"),
 		Whitelist:        k.Strings("conn.whitelist.devices"),
 		OnReqPasskey:     onReqPasskey,
+		Logger:           log.Logger,
+		LogLevel:         zerolog.WarnLevel,
 	}

 	// Connect to InfiniTime with default options
Author	SHA1	Message	Date
Arsen Musayelyan	d318c584da	Use new changes in infinitime library to stop removing InfiniTime devices (Fixes #10 )	2022-04-16 04:28:53 -07:00
Arsen Musayelyan	c8c617c10a	Fix itctl panic when itd is not running (Fixes #14 )	2022-04-02 15:20:31 -07:00