feat: provide endpoint for a specific playlist

Signed-off-by: Matt Gleich <git@mattglei.ch>
gleich · Jan 2, 2025 · a4f8522 · a4f8522
1 parent 7bcd8e9
commit a4f8522
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 23 deletions.
diff --git a/internal/apis/applemusic/applemusic.go b/internal/apis/applemusic/applemusic.go
@@ -60,6 +60,7 @@ func Setup(router *chi.Mux) {
 
 	applemusicCache := cache.New("applemusic", data)
 	router.Get("/applemusic", applemusicCache.ServeHTTP())
+	router.Get("/applemusic/playlist/{id}", playlistEndpoint(*&applemusicCache))
 	router.Handle("/applemusic/ws", applemusicCache.ServeWS())
 	go applemusicCache.UpdatePeriodically(cacheUpdate, 30*time.Second)
 	lumber.Done("setup apple music cache")

diff --git a/internal/apis/applemusic/playlists.go b/internal/apis/applemusic/playlists.go
@@ -1,12 +1,16 @@
 package applemusic
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"time"
 
 	"github.com/gleich/lcp-v2/internal/apis"
+	"github.com/gleich/lcp-v2/internal/cache"
 	"github.com/gleich/lumber/v3"
+	"github.com/go-chi/chi/v5"
 )
 
 type playlist struct {
@@ -73,3 +77,31 @@ func fetchPlaylist(id string) (playlist, error) {
 		ID:           playlistData.Data[0].ID,
 	}, nil
 }
+
+func playlistEndpoint(c *cache.Cache[cacheData]) http.HandlerFunc {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		id := chi.URLParam(r, "id")
+
+		c.DataMutex.RLock()
+		var p *playlist
+		for _, plist := range c.Data.Playlists {
+			if plist.ID == id {
+				p = &plist
+				break
+			}
+		}
+
+		if p == nil {
+			c.DataMutex.RUnlock()
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		err := json.NewEncoder(w).Encode(p)
+		c.DataMutex.RUnlock()
+		if err != nil {
+			lumber.Error(err, "failed to write json data to request")
+			w.WriteHeader(http.StatusInternalServerError)
+		}
+	})
+}
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
@@ -18,8 +18,8 @@ import (
 
 type Cache[T any] struct {
 	name            string
-	dataMutex       sync.RWMutex
-	data            T
+	DataMutex       sync.RWMutex
+	Data            T
 	updated         time.Time
 	filePath        string
 	wsConnPool      map[*websocket.Conn]bool
@@ -52,36 +52,35 @@ type cacheData[T any] struct {
 func (c *Cache[T]) ServeHTTP() http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
-		c.dataMutex.RLock()
-		err := json.NewEncoder(w).Encode(cacheData[T]{Data: c.data, Updated: c.updated})
-		c.dataMutex.RUnlock()
+		c.DataMutex.RLock()
+		err := json.NewEncoder(w).Encode(cacheData[T]{Data: c.Data, Updated: c.updated})
+		c.DataMutex.RUnlock()
 		if err != nil {
-			lumber.Error(err, "failed to write data")
+			lumber.Error(err, "failed to write json data to request")
 			w.WriteHeader(http.StatusInternalServerError)
-			return
 		}
 	})
 }
 
 func (c *Cache[T]) Update(data T) {
-	c.dataMutex.RLock()
-	old, err := json.Marshal(c.data)
+	c.DataMutex.RLock()
+	old, err := json.Marshal(c.Data)
 	if err != nil {
 		lumber.Error(err, "failed to json marshal old data")
 		return
 	}
-	c.dataMutex.RUnlock()
+	c.DataMutex.RUnlock()
 	new, err := json.Marshal(data)
 	if err != nil {
 		lumber.Error(err, "failed to json marshal new data")
 		return
 	}
 
 	if string(old) != string(new) && string(new) != "null" && strings.Trim(string(new), " ") != "" {
-		c.dataMutex.Lock()
-		c.data = data
+		c.DataMutex.Lock()
+		c.Data = data
 		c.updated = time.Now()
-		c.dataMutex.Unlock()
+		c.DataMutex.Unlock()
 
 		c.persistToFile()
 		connectionsUpdated := c.broadcastUpdate()

diff --git a/internal/cache/storage.go b/internal/cache/storage.go
@@ -31,12 +31,12 @@ func (c *Cache[T]) persistToFile() {
 	}
 	defer file.Close()
 
-	c.dataMutex.RLock()
+	c.DataMutex.RLock()
 	b, err := json.Marshal(cacheData[T]{
-		Data:    c.data,
+		Data:    c.Data,
 		Updated: c.updated,
 	})
-	c.dataMutex.RUnlock()
+	c.DataMutex.RUnlock()
 	if err != nil {
 		lumber.Error(err, "encoding data to json failed")
 		return
@@ -60,7 +60,7 @@ func (c *Cache[T]) loadFromFile() {
 			lumber.Fatal(err, "unmarshal json data failed from:", string(b))
 		}
 
-		c.data = data.Data
+		c.Data = data.Data
 		c.updated = data.Updated
 	}
 }
diff --git a/internal/cache/websockets.go b/internal/cache/websockets.go
@@ -20,9 +20,9 @@ func (c *Cache[T]) ServeWS() http.HandlerFunc {
 		c.wsConnPoolMutex.Unlock()
 
 		// sending initial data
-		c.dataMutex.RLock()
-		err = conn.WriteJSON(c.data)
-		c.dataMutex.RUnlock()
+		c.DataMutex.RLock()
+		err = conn.WriteJSON(c.Data)
+		c.DataMutex.RUnlock()
 		if err != nil {
 			lumber.Error(err, "failed to write initial cache data for", c.name)
 			c.removeConnection(conn)
@@ -43,9 +43,9 @@ func (c *Cache[T]) ServeWS() http.HandlerFunc {
 }
 
 func (c *Cache[T]) broadcastUpdate() int {
-	c.dataMutex.RLock()
-	d := c.data
-	c.dataMutex.RUnlock()
+	c.DataMutex.RLock()
+	d := c.Data
+	c.DataMutex.RUnlock()
 
 	updatedConnections := 0
 	for conn := range c.wsConnPool {