Merge pull request #7 from unix-streamdeck/feat/use-api-text-methods

Refactored to use api text methods

Author: The-Jonsey

go.mod

@@ -3,12 +3,8 @@ module github.com/unix-streamdeck/streamdeckd
 go 1.14
 
 require (
-	github.com/fogleman/gg v1.3.0
 	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/api v0.0.0-20200828000516-c734a9f6cec5
+	github.com/unix-streamdeck/api v0.0.0-20200907181211-2f2cfdad366e
 	github.com/unix-streamdeck/driver v0.0.0-20200817173808-cdaf123c076b
-	golang.org/x/image v0.0.0-20200119044424-58c23975cae1
 	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
 )

go.sum

@@ -91,8 +91,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/unix-streamdeck/api v0.0.0-20200828000516-c734a9f6cec5 h1:8WlgvTJMHvfxqmQYyTbfM9TL/BYIm/WfrbDhyA8ihQo=
-github.com/unix-streamdeck/api v0.0.0-20200828000516-c734a9f6cec5/go.mod h1:rweAXRgCWdCACCuVhmleidq7HnJEO38zBGDe8uQqZ0w=
+github.com/unix-streamdeck/api v0.0.0-20200907181211-2f2cfdad366e h1:/stJJT3mpg42pmda9mJocaeWIPc2RHAYe5no8yNrzz4=
+github.com/unix-streamdeck/api v0.0.0-20200907181211-2f2cfdad366e/go.mod h1:Z8bzDHQnWv/2hx9wQXp0/qw6Fp4ty5pFRsgaBG5WYAI=
 github.com/unix-streamdeck/driver v0.0.0-20200817173808-cdaf123c076b h1:27gVti9+OevmBC2BnWlKC0dQ0eiIHh7PvYTWxt4vb6A=
 github.com/unix-streamdeck/driver v0.0.0-20200817173808-cdaf123c076b/go.mod h1:i3Eg6kJBslgUk2VIPJ3Cclta2fpV1KJrOnOnR8gnVKY=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -105,6 +105,8 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200801110659-972c09e46d76 h1:U7GPaoQyQmX+CBRWXKrvRzWTbd+slqeSh8uARsIyhAw=
+golang.org/x/image v0.0.0-20200801110659-972c09e46d76/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

handlers/counter.go

@@ -1,29 +1,27 @@
 package handlers
 
 import (
-	"github.com/fogleman/gg"
 	"github.com/unix-streamdeck/api"
-	"golang.org/x/image/font/inconsolata"
 	"image"
+	"image/draw"
+	"log"
 	"strconv"
-	"time"
 )
 
-func (c *CounterIconHandler) Start(_ api.Key, _ api.StreamDeckInfo, callback func(image image.Image)) {
+func (c *CounterIconHandler) Start(_ api.Key, info api.StreamDeckInfo, callback func(image image.Image)) {
 	if c.Callback == nil {
 		c.Callback = callback
 	}
 	if c.Running {
-		img := gg.NewContext(72, 72)
-		img.SetRGB(0, 0, 0)
-		img.Clear()
-		img.SetRGB(1, 1, 1)
-		img.SetFontFace(inconsolata.Regular8x16)
+		img := image.NewRGBA(image.Rect(0, 0, info.IconSize, info.IconSize))
+		draw.Draw(img, img.Bounds(), image.Black, image.ZP, draw.Src)
 		Count := strconv.Itoa(c.Count)
-		img.DrawStringAnchored(Count, 72/2, 72/2, 0.5, 0.5)
-		img.Clip()
-		callback(img.Image())
-		time.Sleep(250 * time.Millisecond)
+		imgParsed, err := api.DrawText(img, Count)
+		if err != nil {
+			log.Println(err)
+		} else {
+			callback(imgParsed)
+		}
 	}
 }
 

handlers/gif.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"github.com/nfnt/resize"
 	"github.com/unix-streamdeck/api"
 	"image"
 	"image/gif"
@@ -25,7 +24,14 @@ func (s *GifIconHandler) Start(key api.Key, info api.StreamDeckInfo, callback fu
 	timeDelay := gifs.Delay[0]
 	frames := make([]image.Image, len(gifs.Image))
 	for i, frame := range gifs.Image {
-		frames[i] = resize.Resize(uint(info.IconSize), uint(info.IconSize), frame, resize.Lanczos3)
+		img := api.ResizeImage(frame, info.IconSize)
+		if key.Text != "" {
+			img, err = api.DrawText(img, key.Text)
+			if err != nil {
+				log.Println(err)
+			}
+		}
+		frames[i] = img
 	}
 	go loop(frames, timeDelay, callback, s)
 }

handlers/handlers.go

@@ -14,4 +14,4 @@ type GifIconHandler struct {
 
 type TimeIconHandler struct {
 	Running bool
-}
+}

handlers/time.go

@@ -1,10 +1,10 @@
 package handlers
 
 import (
-	"github.com/fogleman/gg"
 	"github.com/unix-streamdeck/api"
-	"golang.org/x/image/font/inconsolata"
 	"image"
+	"image/draw"
+	"log"
 	"time"
 )
 
@@ -28,16 +28,16 @@ func (t *TimeIconHandler) Stop() {
 
 func timeLoop(info api.StreamDeckInfo, callback func(image image.Image), handler *TimeIconHandler) {
 	for handler.Running {
-		img := gg.NewContext(info.IconSize, info.IconSize)
-		img.SetRGB(0, 0, 0)
-		img.Clear()
-		img.SetRGB(1, 1, 1)
-		img.SetFontFace(inconsolata.Regular8x16)
+		img := image.NewRGBA(image.Rect(0, 0, info.IconSize, info.IconSize))
+		draw.Draw(img, img.Bounds(), image.Black, image.ZP, draw.Src)
 		t := time.Now()
 		tString := t.Format("15:04:05")
-		img.DrawStringAnchored(tString, float64(info.IconSize)/2, float64(info.IconSize)/2, 0.5, 0.5)
-		img.Clip()
-		callback(img.Image())
+		imgParsed, err := api.DrawText(img, tString)
+		if err != nil {
+			log.Println(err)
+		} else {
+			callback(imgParsed)
+		}
 		time.Sleep(time.Second)
 	}
 }

interface.go

@@ -2,14 +2,10 @@ package main
 
 import (
 	"context"
-	"github.com/fogleman/gg"
-	"github.com/nfnt/resize"
 	"github.com/unix-streamdeck/api"
 	"github.com/unix-streamdeck/streamdeckd/handlers"
-	"golang.org/x/image/font/inconsolata"
 	"golang.org/x/sync/semaphore"
 	"image"
-	"image/color"
 	"image/draw"
 	"log"
 	"os"
@@ -31,11 +27,7 @@ func LoadImage(path string) (image.Image, error) {
 		return nil, err
 	}
 
-	return ResizeImage(img), nil
-}
-
-func ResizeImage(img image.Image) image.Image {
-	return resize.Resize(dev.Pixels, dev.Pixels, img, resize.Lanczos3)
+	return api.ResizeImage(img, sDInfo.IconSize), nil
 }
 
 func SetImage(img image.Image, i int, page int) {
@@ -62,7 +54,7 @@ func SetKeyImage(currentKey *api.Key, i int) {
 	if currentKey.Buff == nil {
 		if currentKey.Icon == "" {
 			img := image.NewRGBA(image.Rect(0, 0, int(dev.Pixels), int(dev.Pixels)))
-			draw.Draw(img, img.Bounds(), image.NewUniform(color.RGBA{0, 0, 0, 255}), image.ZP, draw.Src)
+			draw.Draw(img, img.Bounds(), image.Black, image.ZP, draw.Src)
 			currentKey.Buff = img
 		} else {
 			img, err := LoadImage(currentKey.Icon)
@@ -73,12 +65,12 @@ func SetKeyImage(currentKey *api.Key, i int) {
 			currentKey.Buff = img
 		}
 		if currentKey.Text != "" {
-			img := gg.NewContextForImage(currentKey.Buff)
-			img.SetRGB(1, 1, 1)
-			img.SetFontFace(inconsolata.Regular8x16)
-			img.DrawStringAnchored(currentKey.Text, 72/2, 72/2, 0.5, 0.5)
-			img.Clip()
-			currentKey.Buff = img.Image()
+			img, err := api.DrawText(currentKey.Buff, currentKey.Text)
+			if err != nil {
+				log.Println(err)
+			} else {
+				currentKey.Buff = img
+			}
 		}
 	}
 	if currentKey.Buff != nil {
@@ -114,6 +106,9 @@ func SetKey(currentKey *api.Key, i int, page int) {
 				return
 			}
 			handler.Start(*currentKey, sDInfo, func(image image.Image) {
+				if image.Bounds().Max.X != 72 || image.Bounds().Max.Y != 72 {
+					image = api.ResizeImage(image, sDInfo.IconSize)
+				}
 				SetImage(image, i, page)
 				currentKey.Buff = image
 			})
@@ -125,6 +120,9 @@ func SetKey(currentKey *api.Key, i int, page int) {
 	if currentKey.IconHandlerStruct != nil && !currentKey.IconHandlerStruct.IsRunning() {
 		currentKey.IconHandlerStruct.SetRunning(true)
 		currentKey.IconHandlerStruct.Start(*currentKey, sDInfo, func(image image.Image) {
+			if image.Bounds().Max.X != 72 || image.Bounds().Max.Y != 72 {
+				image = api.ResizeImage(image, sDInfo.IconSize)
+			}
 			SetImage(image, i, page)
 			currentKey.Buff = image
 		})

main.go

@@ -29,34 +29,11 @@ var connectSem = semaphore.NewWeighted(1)
 var basicConfig = api.Config{
 	Pages: []api.Page{
 		{
-			api.Key{},
 		},
 	},
 }
 
 func main() {
-	var err error
-	config, err = readConfig()
-	if err != nil && !os.IsNotExist(err) {
-		log.Println(err)
-	} else if os.IsNotExist(err) {
-		file, err := os.Create(configPath)
-		if err != nil {
-			log.Println(err)
-		}
-		err = file.Close()
-		if err != nil {
-			log.Println(err)
-		}
-		config = &basicConfig
-		err = SaveConfig()
-		if err != nil {
-			log.Println(err)
-		}
-	}
-	if len(config.Pages) == 0 {
-		config.Pages = append(config.Pages, api.Page{})
-	}
 	cleanupHook()
 	go InitDBUS()
 	attemptConnection()
@@ -66,6 +43,9 @@ func attemptConnection() {
 	for !isOpen {
 		_ = openDevice()
 		if isOpen {
+			if config == nil {
+				loadConfig()
+			}
 			SetPage(config, p)
 			if sDbus != nil {
 				sDInfo.IconSize = int(dev.Pixels)
@@ -117,6 +97,36 @@ func openDevice() error {
 	return nil
 }
 
+func loadConfig() {
+	var err error
+	config, err = readConfig()
+	if err != nil && !os.IsNotExist(err) {
+		log.Println(err)
+	} else if os.IsNotExist(err) {
+		file, err := os.Create(configPath)
+		if err != nil {
+			log.Println(err)
+		}
+		err = file.Close()
+		if err != nil {
+			log.Println(err)
+		}
+		config = &basicConfig
+		page := config.Pages[0]
+		for i := 0; i < int(dev.Rows)*int(dev.Columns); i++ {
+			page = append(page, api.Key{})
+		}
+		config.Pages[0] = page
+		err = SaveConfig()
+		if err != nil {
+			log.Println(err)
+		}
+	}
+	if len(config.Pages) == 0 {
+		config.Pages = append(config.Pages, api.Page{})
+	}
+}
+
 func readConfig() (*api.Config, error) {
 	data, err := ioutil.ReadFile(configPath)
 	if err != nil {
@@ -169,14 +179,7 @@ func SetConfig(configString string) error {
 
 func ReloadConfig() error {
 	unmountHandlers()
-	var err error
-	config, err = readConfig()
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	if len(config.Pages) == 0 {
-		config.Pages = append(config.Pages, api.Page{})
-	}
+	loadConfig()
 	SetPage(config, p)
 	return nil
 }