Added DBus to docs

Author: The-Jonsey

README.md

@@ -54,3 +54,29 @@ The actions you can have on a button are:
 - `url`: opens a url in your default browser via xdg
 - `brightness`: set the brightness of the streamdeck as a percentage
 - `switch_page`: change the active page on the streamdeck
+
+
+### D-Bus
+
+There is a D-Bus interface built into the daemon, the service name and interface for D-Bus are `com.thejonsey.streamdeck` and `com/thejonsey/streamdeck` respectively, and is made up of the following methods/signals
+
+#### Methods
+
+- GetConfig  - returns the current running config
+- SetConfig  - sets the config, without saving to disk, takes in Stringified json, returns an error if anything breaks
+- ReloadConfig  - reloads the config from disk
+- GetDeckInfo  - Returns information about the active streamdeck in the format of 
+```json
+{
+  "icon_size": 72,
+  "rows": 3,
+  "cols": 5,
+  "page": 0
+}
+```
+- SetPage - Set the page on the streamdeck to the number passed to it, returns an error if anything breaks
+- CommitConfig  - Commits the currently active config to disk, returns an error if anything breaks
+
+#### Signals
+
+- Page - sends the number of the page switched to on the StreamDeck

dbus.go

@@ -4,36 +4,40 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/godbus/dbus/v5"
-	"github.com/godbus/dbus/v5/introspect"
 	"log"
 	"os"
 )
 
-const intro = `
-<node>
-	<interface name="com.thejonsey.streamdeckd">
-		<method name="GetDeckInfo">
-			<arg direction="out" type="s"/>
-		</method>
-		<method name="GetConfig">
-			<arg direction="out" type="s"/>
-		</method>
-		<method name="ReloadConfig">
-		</method>
-		<method name="SetPage">
-			<arg direction="in" type"i"/>
-		</method>
-		<method name="SetConfig">
-			<arg direction="in" type="s"/>
-		</method>
-		<method name="CommitConfig">
-		</method>
-	</interface>` + introspect.IntrospectDataString + `</node> `
+//const intro = `
+//<node>
+//	<interface name="com.thejonsey.streamdeckd">
+//		<method name="GetDeckInfo">
+//			<arg direction="out" type="s"/>
+//		</method>
+//		<method name="GetConfig">
+//			<arg direction="out" type="s"/>
+//		</method>
+//		<method name="ReloadConfig">
+//		</method>
+//		<method name="SetPage">
+//			<arg direction="in" type"i"/>
+//		</method>
+//		<method name="SetConfig">
+//			<arg direction="in" type="s"/>
+//		</method>
+//		<method name="CommitConfig">
+//		</method>
+//	</interface>` + introspect.IntrospectDataString + `</node> `
+
+var conn *dbus.Conn
+
+var s *StreamDeckDBus
 
 type StreamDeckDBus struct {
 	Cols int `json:"cols,omitempty"`
 	Rows int `json:"rows,omitempty"`
-	IconSize uint `json:"icon_size,omitempty"`
+	IconSize int `json:"icon_size,omitempty"`
+	Page int `json:"page"`
 }
 
 func (s StreamDeckDBus) GetDeckInfo() (string, *dbus.Error) {
@@ -82,20 +86,20 @@ func (StreamDeckDBus) CommitConfig() *dbus.Error {
 }
 
 func InitDBUS() {
-	conn, err := dbus.SessionBus()
+	var err error
+	conn, err = dbus.SessionBus()
 	if err != nil {
 		log.Println(err)
 	}
 	defer conn.Close()
 
-	s := StreamDeckDBus{
+	s = &StreamDeckDBus{
 		Cols: int(dev.Columns),
 		Rows: int(dev.Rows),
-		IconSize: dev.Pixels,
+		IconSize: int(dev.Pixels),
+		Page: p,
 	}
-	conn.Export(s, "/com/thejonsey/streamdeckd", "com.thejonsey.streamdeckd")
-	conn.Export(introspect.Introspectable(intro), "/com/thejonsey/streamdeckd",
-		"org.freedesktop.DBus.Introspectable")
+	conn.ExportAll(s, "/com/thejonsey/streamdeckd", "com.thejonsey.streamdeckd")
 	reply, err := conn.RequestName("com.thejonsey.streamdeckd",
 		dbus.NameFlagDoNotQueue)
 	if err != nil {
@@ -106,4 +110,13 @@ func InitDBUS() {
 		os.Exit(1)
 	}
 		select {}
+}
+
+func EmitPage(page int) {
+	if conn != nil {
+		conn.Emit("/com/thejonsey/streamdeckd", "com.thejonsey.streamdeckd.Page", page)
+	}
+	if s != nil {
+		s.Page = page
+	}
 }

go.mod

@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/fogleman/gg v1.3.0
-	github.com/godbus/dbus/v5 v5.0.3
+	github.com/godbus/dbus/v5 v5.0.4-0.20200513180336-df5ef3eb7cca
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/unix-streamdeck/streamdeck v0.0.0-20200727161137-d2d416a422d2

go.sum

@@ -25,8 +25,8 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
-github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.4-0.20200513180336-df5ef3eb7cca h1:ewc47M3S8MAZgSO1yEnPrbmHjtQz6caAhYWOQzPHBok=
+github.com/godbus/dbus/v5 v5.0.4-0.20200513180336-df5ef3eb7cca/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=

interface.go

@@ -48,7 +48,7 @@ func SetKey(currentKey *Key, i int) {
 		} else {
 			img, err := LoadImage(currentKey.Icon)
 			if err != nil {
-				log.Fatal(err)
+				log.Panic(err)
 			}
 			currentKey.Buff = img
 		}
@@ -92,6 +92,7 @@ func SetPage(config *Config, page int, dev streamdeck.Device) {
 			SetImage(currentKey.Buff, i, p, dev)
 		}
 	}
+	EmitPage(p)
 }
 
 func HandleInput(key *Key, page int, index int, dev streamdeck.Device) {