Refactor to use ViewModel

main.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ilyakaznacheev/cleanenv"
 	"github.com/sirupsen/logrus"
 	"github.com/thechubbypanda/syncify/config"
+	"github.com/thechubbypanda/syncify/model"
 	"github.com/thechubbypanda/syncify/views"
 	"github.com/zmb3/spotify/v2"
 	"github.com/zmb3/spotify/v2/auth"
@@ -84,7 +85,7 @@ func main() {
 func Root(w http.ResponseWriter, r *http.Request) {
 	token, ok := sm.Get(r.Context(), "token").(oauth2.Token)
 	if !ok || token.Expiry.Before(time.Now()) {
-		err := views.Root(cfg.Plausible, nil, -1, nil, "").Render(w)
+		err := views.Root(model.Model{Plausible: &cfg.Plausible}).Render(w)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -100,7 +101,10 @@ func Root(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = views.Root(cfg.Plausible, user, -1, nil, "").Render(w)
+	err = views.Root(model.Model{
+		Plausible: &cfg.Plausible,
+		User:      user,
+	}).Render(w)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

model/model.go

@@ -0,0 +1,18 @@
+package model
+
+import (
+	"github.com/thechubbypanda/syncify/config"
+	"github.com/zmb3/spotify/v2"
+)
+
+type Model struct {
+	Plausible   *config.Plausible
+	User        *spotify.PrivateUser
+	SyncOutcome *SyncResponse
+}
+
+type SyncResponse struct {
+	Count       int
+	PlaylistUrl string
+	Err         error
+}

sync.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"github.com/sirupsen/logrus"
+	"github.com/thechubbypanda/syncify/model"
 	"github.com/thechubbypanda/syncify/views"
 	"github.com/zmb3/spotify/v2"
 	spotifyauth "github.com/zmb3/spotify/v2/auth"
@@ -115,37 +116,37 @@ func truncatePlaylist(r *http.Request, s *spotify.Client, user *spotify.PrivateU
 	return nil
 }
 
-func sync(r *http.Request, token *oauth2.Token) (int, string, error) {
+func sync(r *http.Request, token *oauth2.Token) model.SyncResponse {
 	s := spotify.New(spotifyauth.New().Client(r.Context(), token))
 
 	user, err := s.CurrentUser(r.Context())
 	if err != nil {
 		logrus.Errorln("failed to fetch user: ", err)
-		return 0, "", err
+		return model.SyncResponse{Err: err}
 	}
 
 	logrus.Debugln(user.ID, ":", "starting sync")
 
 	playlist, err := getPlaylist(r, s, user)
 	if err != nil {
 		logrus.Errorln(user.ID, ":", err)
-		return 0, "", err
+		return model.SyncResponse{Err: err}
 	}
 
 	logrus.Debugln(user.ID, ":", "using playlist", playlist.ID)
 
 	err = truncatePlaylist(r, s, user, playlist)
 	if err != nil {
 		logrus.Errorln(user.ID, ":", err)
-		return 0, "", err
+		return model.SyncResponse{Err: err}
 	}
 
 	logrus.Debugln(user.ID, ":", "truncated playlist", playlist.ID)
 
 	trackIds, err := getLikedTrackIds(r, s)
 	if err != nil {
 		logrus.Errorln(user.ID, ":", err)
-		return 0, "", err
+		return model.SyncResponse{Err: err}
 	}
 
 	logrus.Debugln(user.ID, ":", "found", len(trackIds), "liked songs")
@@ -156,14 +157,17 @@ func sync(r *http.Request, token *oauth2.Token) (int, string, error) {
 			_, err := s.AddTracksToPlaylist(r.Context(), playlist.ID, trackIds[i*100:min((i+1)*100, len(trackIds))]...)
 			if err != nil {
 				logrus.Errorln(user.ID, ":", err)
-				return 0, "", err
+				return model.SyncResponse{Err: err}
 			}
 		}
 	}
 
 	logrus.Infoln(user.ID, ":", "sync complete for", len(trackIds), "songs")
 
-	return len(trackIds), playlist.ExternalURLs["spotify"], nil
+	return model.SyncResponse{
+		Count:       len(trackIds),
+		PlaylistUrl: playlist.ExternalURLs["spotify"],
+	}
 }
 
 func Sync(w http.ResponseWriter, r *http.Request) {
@@ -174,8 +178,12 @@ func Sync(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	count, playlistUrl, err := sync(r, &token)
-	err = views.Outcome(count, err, playlistUrl).Render(w)
+	syncResponse := sync(r, &token)
+	err := views.Outcome(model.Model{
+		Plausible:   nil,
+		User:        nil,
+		SyncOutcome: &syncResponse,
+	}).Render(w)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

views/page.go

@@ -4,23 +4,23 @@ import (
 	g "github.com/maragudk/gomponents"
 	c "github.com/maragudk/gomponents/components"
 	. "github.com/maragudk/gomponents/html"
-	"github.com/thechubbypanda/syncify/config"
+	"github.com/thechubbypanda/syncify/model"
 )
 
-func Page(plausible config.Plausible, contents ...g.Node) g.Node {
+func Page(model model.Model, contents ...g.Node) g.Node {
 	head := []g.Node{
 		Meta(Name("description"), Content("Sync your Spotify 'Liked Songs' playlist to a sharable one.")),
 		Meta(Name("keywords"), Content("spotify, sync, likes, liked, songs, public, playlist")),
 		Meta(Name("author"), Content("Keval \"thechubbypanda\" Kapdee")),
 		Script(Src("https://unpkg.com/htmx.org@1.9.12"), Integrity("sha384-ujb1lZYygJmzgSwoxRggbCHcjc0rB2XoQrxeTUQyRjrOnlCoYta87iKBWq3EsdM2"), CrossOrigin("anonymous")),
 		Link(Rel("stylesheet"), Href("/stylesheet.css")),
 	}
-	if plausible.ScriptUrl != "" {
+	if model.Plausible.ScriptUrl != "" {
 		head = append(head, Script(
-			Src(plausible.ScriptUrl),
+			Src(model.Plausible.ScriptUrl),
 			Defer(),
-			Data("domain", plausible.DataDomain),
-			Data("api", plausible.DataApi),
+			Data("domain", model.Plausible.DataDomain),
+			Data("api", model.Plausible.DataApi),
 		))
 	}
 	return c.HTML5(c.HTML5Props{

views/root.go

@@ -5,26 +5,25 @@ import (
 	hx "github.com/maragudk/gomponents-htmx"
 	. "github.com/maragudk/gomponents/html"
 	"github.com/maragudk/gomponents/svg"
-	"github.com/thechubbypanda/syncify/config"
-	"github.com/zmb3/spotify/v2"
+	"github.com/thechubbypanda/syncify/model"
 	"strconv"
 )
 
-func Root(plausible config.Plausible, user *spotify.PrivateUser, count int, err error, playlistUrl string) g.Node {
+func Root(model model.Model) g.Node {
 	return Page(
-		plausible,
+		model,
 		Div(Class("flex flex-col items-center justify-center h-screen gap-6 p-8"),
 			Div(Class("flex flex-col items-center gap-2"),
 				H1(Class("text-3xl font-bold"), g.Text("Syncify")),
 				P(Class("text-lg text-gray-600 text-center"), g.Text("Sync your Spotify 'Liked Songs' playlist to a sharable one.")),
-				UserText(user),
+				UserText(model),
 			),
-			Buttons(user),
+			Buttons(model),
 			SVG(ID("spinner"), Aria("hidden", "true"), Class("inline w-8 h-8 text-gray-200 animate-spin fill-green-500"), svg.ViewBox("0 0 100 101"), svg.Fill("none"),
 				svg.Path(svg.D("M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"), svg.Fill("currentColor")),
 				svg.Path(svg.D("M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"), svg.Fill("currentFill")),
 			),
-			Outcome(count, err, playlistUrl),
+			Outcome(model),
 			P(
 				Class("absolute bottom-0 p-4 text-center"),
 				A(Class("text-green-500"), Href("https://github.com/thechubbypanda/syncify"), g.Text("Syncify")),
@@ -35,18 +34,18 @@ func Root(plausible config.Plausible, user *spotify.PrivateUser, count int, err
 	)
 }
 
-func UserText(user *spotify.PrivateUser) g.Node {
-	if user == nil {
+func UserText(model model.Model) g.Node {
+	if model.User == nil {
 		return Div()
 	}
 	return Div(
 		Class("text-gray-500 dark:text-gray-400"),
-		Span(g.Text("Logged in as "), Span(Class("font-medium"), g.Text(user.DisplayName))),
+		Span(g.Text("Logged in as "), Span(Class("font-medium"), g.Text(model.User.DisplayName))),
 	)
 }
 
-func Buttons(user *spotify.PrivateUser) g.Node {
-	if user == nil {
+func Buttons(model model.Model) g.Node {
+	if model.User == nil {
 		return Div(
 			Class("flex gap-2"),
 			A(
@@ -75,14 +74,14 @@ func Buttons(user *spotify.PrivateUser) g.Node {
 	)
 }
 
-func Outcome(count int, err error, playlistUrl string) g.Node {
+func Outcome(model model.Model) g.Node {
 	var o g.Node
-	if count == -1 {
+	if model.SyncOutcome == nil {
 		o = Div()
-	} else if err != nil {
-		o = g.Text("Error: " + err.Error())
+	} else if model.SyncOutcome.Err != nil {
+		o = g.Text("Error: " + model.SyncOutcome.Err.Error())
 	} else {
-		o = Span(g.Text("Successfully synchronized "+strconv.Itoa(count)+" tracks to your "), A(Class("text-green-500"), Href(playlistUrl), g.Text("Syncify playlist")))
+		o = Span(g.Text("Successfully synchronized "+strconv.Itoa(model.SyncOutcome.Count)+" tracks to your "), A(Class("text-green-500"), Href(model.SyncOutcome.PlaylistUrl), g.Text("Syncify playlist")))
 	}
 	return Div(ID("outcome"), Class("text-gray-500 text-center"), o)
 }