Merge branch 'screen' of github.com:ZeusWPI/SCC into screen

api/main.go

@@ -22,5 +22,7 @@ func Start(screenApp *screen.ScreenApp) {
 	r.GET("/message", handlerWrapper(screenApp, getMessage))
 	r.POST("/message", handlerWrapper(screenApp, postMessage))
 
+	r.POST("/spotify", spotifyHandlerWrapper(screenApp))
+
 	r.Run()
 }

api/spotify.go

@@ -0,0 +1,17 @@
+package api
+
+import (
+	"github.com/gin-gonic/gin"
+	"scc/screen"
+)
+
+func spotifyHandlerWrapper(app *screen.ScreenApp) func(*gin.Context) {
+	return func(ctx *gin.Context) {
+		spotifyHandler(app, ctx)
+	}
+}
+
+func spotifyHandler(app *screen.ScreenApp, ctx *gin.Context) {
+	b, _ := ctx.GetRawData()
+	app.Spotify.Update(string(b))
+}

screen/spotify.go

@@ -4,13 +4,15 @@ import (
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 	"strings"
+	"sync"
 	"time"
 )
 
 type Spotify struct {
 	screenApp *ScreenApp
 	view      *tview.TextView
 
+	mu     sync.Mutex
 	text   string
 	buffer string
 }
@@ -41,22 +43,32 @@ func (spotify *Spotify) Run() {
 
 		if w != 0 {
 
+			spotify.mu.Lock()
+
 			if len(spotify.buffer) != w {
+				if len(spotify.text) > w {
+					spotify.text = spotify.text[0 : w-4]
+					spotify.text += "..."
+				}
 				spotify.buffer = spotify.text + strings.Repeat(" ", w-len(spotify.text))
 			}
 
 			spotify.buffer = spotify.buffer[1:] + string(spotify.buffer[0])
 
+			spotify.mu.Unlock()
+
 			spotify.screenApp.app.QueueUpdateDraw(func() {
 				spotify.view.SetText(spotify.buffer)
 			})
-
 		}
-
 		time.Sleep(50 * time.Millisecond)
 	}
 }
 
 func (spotify *Spotify) Update(text string) {
+	spotify.mu.Lock()
+	defer spotify.mu.Unlock()
 
+	spotify.text = text
+	spotify.buffer = ""
 }