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

Reviewed-on: https://gitea.arsenm.dev/Arsen6331/itd/pulls/15

cmd/itctl/main.go

@@ -61,7 +61,7 @@ func main() {
 						Name:      "remove",
 						ArgsUsage: "<paths...>",
 						Aliases:   []string{"rm"},
-						Usage:     "Create a new directory",
+						Usage:     "Remove a file from InfiniTime",
 						Action:    fsRemove,
 					},
 					{
@@ -184,14 +184,10 @@ func main() {
 			return nil
 		},
 		After: func(*cli.Context) error {
-			return client.Close()
+			if client != nil {
-		},
+				client.Close()
-		ExitErrHandler: func(c *cli.Context, err error) {
-			cli.ShowCommandHelp(c, c.Command.Name)
-			if err != nil {
-				log.Fatal().Msgf("%v", err)
 			}
-			os.Exit(0)
+			return nil
 		},
 	}
 

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

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-20220416112421-b7a50271bece h1:ns/GMc4E8ZUZ9TEXhXgU4M+5sRaOLTFFoBWEJ67p3YM=
-go.arsenm.dev/infinitime v0.0.0-20220304200437-7026da3f6f14/go.mod h1:Prvwx7Y2y8HsNRA1tPptduW9jzuw/JffmocvoHcDbYo=
+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=

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

music.go

@@ -22,22 +22,27 @@ import (
 	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
 	"go.arsenm.dev/infinitime/pkg/player"
+	"go.arsenm.dev/itd/translit"
 )
 
 func initMusicCtrl(dev *infinitime.Device) error {
 	player.Init()
 
+	maps := k.Strings("notifs.translit.use")
+	translit.Transliterators["custom"] = translit.Map(k.Strings("notifs.translit.custom"))
+
 	player.OnChange(func(ct player.ChangeType, val string) {
+		newVal := translit.Transliterate(val, maps...)
 		if !firmwareUpdating {
 			switch ct {
 			case player.ChangeTypeStatus:
 				dev.Music.SetStatus(val == "Playing")
 			case player.ChangeTypeTitle:
-				dev.Music.SetTrack(val)
+				dev.Music.SetTrack(newVal)
 			case player.ChangeTypeAlbum:
-				dev.Music.SetAlbum(val)
+				dev.Music.SetAlbum(newVal)
 			case player.ChangeTypeArtist:
-				dev.Music.SetArtist(val)
+				dev.Music.SetArtist(newVal)
 			}
 		}
 	})

translit/translit.go

@@ -346,10 +346,21 @@ var Transliterators = map[string]Transliterator{
 		"”", "\"",
 	},
 	"Emoji": Map{
-		"😂", ":')",
+		"😂", "XD",
+		"🤣", "XD",
 		"😊", ":)",
-		"😃", ":)",
+		"☺️", ":)",
+		"😌", ":)",
+		"😃", ":D",
+		"😁", ":D",
+		"😋", ":P",
+		"😛", ":P",
+		"😜", ";P",
+		"🙃", "(:",
+		"😎", "8)",
+		"😶", ":#",
 		"😩", "-_-",
+		"😕", ":(",
 		"😏", ":‑J",
 		"💜", "<3",
 		"💖", "<3",
@@ -361,12 +372,37 @@ var Transliterators = map[string]Transliterator{
 		"💓", "<3",
 		"💚", "<3",
 		"💙", "<3",
+		"💟", "<3",
+		"❣️", "<3!",
 		"💔", "</3",
 		"😱", "D:",
 		"😮", ":O",
-		"😝", ":P",
+		"😯", ":O",
-		"😍", ":x",
+		"😝", "xP",
-		"😢", ":(",
+		"🤔", "',:-|",
+		"😔", ":|",
+		"😍", ":*",
+		"😘", ":*",
+		"😚", ":*",
+		"😙", ":*",
+		"👍", ":thumbsup:",
+		"👌", ":ok_hand:",
+		"🤞", ":crossed_fingers:",
+		"✌️", ":victory_hand:",
+		"🌄", ":sunrise_over_mountains:",
+		"🌞", ":sun_with_face:",
+		"🤗", ":hugging_face:",
+		"🌻", ":sunflower:",
+		"🥱", ":yawning_face:",
+		"🙄", ":face_with_rolling_eyes:",
+		"🔫", ":gun:",
+		"🥔", ":potato:",
+		"😬", ":E",
+		"✨", "***",
+		"🌌", "***",
+		"💀", "8-X",
+		"😅", "':D",
+		"😢", ":'(",
 		"💯", ":100:",
 		"🔥", ":fire:",
 		"😉", ";)",

weather.go

@@ -75,7 +75,6 @@ func initWeather(dev *infinitime.Device) error {
 
 	go func() {
 		for {
-			fmt.Println("weather update")
 			// Attempt to get weather
 			data, err := getWeather(lat, lon)
 			if err != nil {