Merge pull request #5 from unix-streamdeck/feat/hotplug

Feat/hotplug

Author: The-Jonsey

dbus.go

@@ -7,16 +7,15 @@ import (
 	"log"
 )
 
-
 var conn *dbus.Conn
 
-var s *StreamDeckDBus
+var sDbus *StreamDeckDBus
 
 type StreamDeckDBus struct {
-	Cols int `json:"cols,omitempty"`
-	Rows int `json:"rows,omitempty"`
+	Cols     int `json:"cols,omitempty"`
+	Rows     int `json:"rows,omitempty"`
 	IconSize int `json:"icon_size,omitempty"`
-	Page int `json:"page"`
+	Page     int `json:"page"`
 }
 
 func (s StreamDeckDBus) GetDeckInfo() (string, *dbus.Error) {
@@ -43,8 +42,8 @@ func (StreamDeckDBus) ReloadConfig() *dbus.Error {
 	return nil
 }
 
-func (StreamDeckDBus) SetPage(page int) *dbus.Error  {
-	SetPage(config, page, dev)
+func (StreamDeckDBus) SetPage(page int) *dbus.Error {
+	SetPage(config, page)
 	return nil
 }
 
@@ -73,13 +72,10 @@ func InitDBUS() error {
 	}
 	defer conn.Close()
 
-	s = &StreamDeckDBus{
-		Cols: int(dev.Columns),
-		Rows: int(dev.Rows),
-		IconSize: int(dev.Pixels),
+	sDbus = &StreamDeckDBus{
 		Page: p,
 	}
-	conn.ExportAll(s, "/com/unixstreamdeck/streamdeckd", "com.unixstreamdeck.streamdeckd")
+	conn.ExportAll(sDbus, "/com/unixstreamdeck/streamdeckd", "com.unixstreamdeck.streamdeckd")
 	reply, err := conn.RequestName("com.unixstreamdeck.streamdeckd",
 		dbus.NameFlagDoNotQueue)
 	if err != nil {
@@ -89,14 +85,14 @@ func InitDBUS() error {
 	if reply != dbus.RequestNameReplyPrimaryOwner {
 		return errors.New("DBus: Name already taken")
 	}
-		select {}
+	select {}
 }
 
 func EmitPage(page int) {
 	if conn != nil {
 		conn.Emit("/com/unixstreamdeck/streamdeckd", "com.unixstreamdeck.streamdeckd.Page", page)
 	}
-	if s != nil {
-		s.Page = page
+	if sDbus != nil {
+		sDbus.Page = page
 	}
-}
+}

interface.go

@@ -14,6 +14,7 @@ import (
 	"image/draw"
 	"log"
 	"os"
+	"strings"
 )
 
 var p int
@@ -38,16 +39,23 @@ func ResizeImage(img image.Image) image.Image {
 	return resize.Resize(dev.Pixels, dev.Pixels, img, resize.Lanczos3)
 }
 
-func SetImage(img image.Image, i int, page int, dev streamdeck.Device) {
+func SetImage(img image.Image, i int, page int, _ streamdeck.Device) {
 	ctx := context.Background()
 	err := sem.Acquire(ctx, 1)
 	if err != nil {
 		log.Println(err)
 		return
 	}
 	defer sem.Release(1)
-	if p == page {
-		dev.SetImage(uint8(i), img)
+	if p == page && isOpen {
+		err := dev.SetImage(uint8(i), img)
+		if err != nil {
+			if strings.Contains(err.Error(), "hidapi") {
+				disconnect()
+			} else {
+				log.Println(err)
+			}
+		}
 	}
 }
 
@@ -79,7 +87,7 @@ func SetKeyImage(currentKey *api.Key, i int) {
 	}
 }
 
-func SetPage(config *api.Config, page int, dev streamdeck.Device) {
+func SetPage(config *api.Config, page int) {
 	p = page
 	currentPage := config.Pages[page]
 	for i := 0; i < len(currentPage); i++ {
@@ -114,7 +122,7 @@ func SetKey(currentKey *api.Key, i int, page int, dev streamdeck.Device) {
 	}
 }
 
-func HandleInput(key *api.Key, page int, index int, dev streamdeck.Device) {
+func HandleInput(key *api.Key, page int, index int) {
 	if key.Command != "" {
 		runCommand(key.Command)
 	}
@@ -123,7 +131,7 @@ func HandleInput(key *api.Key, page int, index int, dev streamdeck.Device) {
 	}
 	if key.SwitchPage != 0 {
 		page = key.SwitchPage - 1
-		SetPage(config, page, dev)
+		SetPage(config, page)
 	}
 	if key.Brightness != 0 {
 		err := dev.SetBrightness(uint8(key.Brightness))
@@ -145,7 +153,7 @@ func HandleInput(key *api.Key, page int, index int, dev streamdeck.Device) {
 			}
 			key.KeyHandlerStruct = handler
 		}
-		key.KeyHandlerStruct.Key(page, index, key, dev)
+		key.KeyHandlerStruct.Key(page, index, key, streamdeck.Device{})
 	}
 }
 
@@ -154,19 +162,16 @@ func Listen() {
 	if err != nil {
 		log.Println(err)
 	}
-	for {
+	for isOpen {
 		select {
 		case k, ok := <-kch:
 			if !ok {
-				err = dev.Open()
-				if err != nil {
-					log.Println(err)
-				}
-				continue
+				disconnect()
+				return
 			}
 			if k.Pressed == true {
 				if len(config.Pages)-1 >= p && len(config.Pages[p])-1 >= int(k.Index) {
-					HandleInput(&config.Pages[p][k.Index], p, int(k.Index), dev)
+					HandleInput(&config.Pages[p][k.Index], p, int(k.Index))
 				}
 			}
 		}

main.go

@@ -1,9 +1,13 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"github.com/unix-streamdeck/api"
 	"github.com/unix-streamdeck/driver"
+	"golang.org/x/sync/semaphore"
 	_ "image/gif"
 	_ "image/jpeg"
 	_ "image/png"
@@ -17,30 +21,21 @@ import (
 
 var dev streamdeck.Device
 var config *api.Config
-var configPath = os.Getenv("HOME") + "/.streamdeck-config.json"
+var configPath = os.Getenv("HOME") + string(os.PathSeparator) + ".streamdeck-config.json"
+var isOpen = false
+var disconnectSem = semaphore.NewWeighted(1)
+var connectSem = semaphore.NewWeighted(1)
 
 var basicConfig = api.Config{
 	Pages: []api.Page{
 		{
-			api.Key{
-			},
+			api.Key{},
 		},
 	},
 }
 
 func main() {
-	d, err := streamdeck.Devices()
-	if err != nil {
-		log.Println(err)
-	}
-	if len(d) == 0 {
-		log.Println("No Stream Deck devices found.")
-	}
-	dev = d[0]
-	err = dev.Open()
-	if err != nil {
-		log.Println(err)
-	}
+	var err error
 	config, err = readConfig()
 	if err != nil && !os.IsNotExist(err) {
 		log.Println(err)
@@ -63,9 +58,63 @@ func main() {
 		config.Pages = append(config.Pages, api.Page{})
 	}
 	cleanupHook()
-	SetPage(config, 0, dev)
 	go InitDBUS()
-	Listen()
+	attemptConnection()
+}
+
+func attemptConnection() {
+	for !isOpen {
+		_ = openDevice()
+		if isOpen {
+			SetPage(config, p)
+			if sDbus != nil {
+				sDbus.IconSize = int(dev.Pixels)
+				sDbus.Rows = int(dev.Rows)
+				sDbus.Cols = int(dev.Columns)
+			}
+			Listen()
+		}
+	}
+}
+
+func disconnect() {
+	ctx := context.Background()
+	err := disconnectSem.Acquire(ctx, 1)
+	if err != nil {
+		return
+	}
+	defer disconnectSem.Release(1)
+	if !isOpen {
+		return
+	}
+	log.Println("Device disconnected")
+	_ = dev.Close()
+	isOpen = false
+	unmountHandlers()
+}
+
+func openDevice() error {
+	ctx := context.Background()
+	err := connectSem.Acquire(ctx, 1)
+	if err != nil {
+		return err
+	}
+	defer connectSem.Release(1)
+	d, err := streamdeck.Devices()
+	if err != nil {
+		return err
+	}
+	if len(d) == 0 {
+		return errors.New("No streamdeck devices found")
+	}
+	err = d[0].Open()
+	if err != nil {
+		return err
+	}
+	dev = d[0]
+	isOpen = true
+	fmt.Println("Device (" + dev.Serial + ") connected")
+	return nil
 }
 
 func readConfig() (*api.Config, error) {
@@ -81,7 +130,6 @@ func readConfig() (*api.Config, error) {
 	return &config, nil
 }
 
-
 func runCommand(command string) {
 	//args := strings.Split(command, " ")
 	c := exec.Command("/bin/sh", "-c", command)
@@ -115,7 +163,7 @@ func SetConfig(configString string) error {
 	if len(config.Pages) == 0 {
 		config.Pages = append(config.Pages, api.Page{})
 	}
-	SetPage(config, p, dev)
+	SetPage(config, p)
 	return nil
 }
 
@@ -129,7 +177,7 @@ func ReloadConfig() error {
 	if len(config.Pages) == 0 {
 		config.Pages = append(config.Pages, api.Page{})
 	}
-	SetPage(config, p, dev)
+	SetPage(config, p)
 	return nil
 }
 
@@ -158,11 +206,13 @@ func SaveConfig() error {
 func unmountHandlers() {
 	for i := range config.Pages {
 		page := config.Pages[i]
-		for i2 := range page {
-			key := page[i2]
+		for i2 := 0; i2 < len(page); i2++ {
+			key := &page[i2]
 			if key.IconHandlerStruct != nil {
 				key.IconHandlerStruct.Stop()
+				key.IconHandlerStruct = nil
+				key.Buff = nil
 			}
 		}
 	}
-}
+}