Skip to content

Commit

Permalink
Add link to playlist
Browse files Browse the repository at this point in the history
  • Loading branch information
thechubbypanda committed Jun 19, 2024
1 parent 117c57c commit d360c4f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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(nil, -1, nil).Render(w)
err := views.Root(nil, -1, nil, "").Render(w)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -93,7 +93,7 @@ func Root(w http.ResponseWriter, r *http.Request) {
return
}

err = views.Root(user, -1, nil).Render(w)
err = views.Root(user, -1, nil, "").Render(w)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
Expand Down
18 changes: 9 additions & 9 deletions sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,37 +115,37 @@ func truncatePlaylist(r *http.Request, s *spotify.Client, user *spotify.PrivateU
return nil
}

func sync(r *http.Request, token *oauth2.Token) (int, error) {
func sync(r *http.Request, token *oauth2.Token) (int, string, error) {
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 0, "", 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 0, "", 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 0, "", 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 0, "", err
}

logrus.Debugln(user.ID, ":", "found", len(trackIds), "liked songs")
Expand All @@ -156,14 +156,14 @@ func sync(r *http.Request, token *oauth2.Token) (int, 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 0, "", err
}
}
}

logrus.Infoln(user.ID, ":", "sync complete for", len(trackIds), "songs")

return len(trackIds), nil
return len(trackIds), playlist.ExternalURLs["spotify"], nil
}

func Sync(w http.ResponseWriter, r *http.Request) {
Expand All @@ -174,8 +174,8 @@ func Sync(w http.ResponseWriter, r *http.Request) {
return
}

count, err := sync(r, &token)
err = views.Outcome(count, err).Render(w)
count, playlistUrl, err := sync(r, &token)
err = views.Outcome(count, err, playlistUrl).Render(w)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
Expand Down
8 changes: 4 additions & 4 deletions views/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
)

func Root(user *spotify.PrivateUser, count int, err error) g.Node {
func Root(user *spotify.PrivateUser, count int, err error, playlistUrl string) g.Node {
return Page(
Div(Class("flex flex-col items-center justify-center h-screen gap-6 p-8"),
Div(Class("flex flex-col items-center gap-2"),
Expand All @@ -22,7 +22,7 @@ func Root(user *spotify.PrivateUser, count int, err error) g.Node {
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),
Outcome(count, err, playlistUrl),
),
)
}
Expand Down Expand Up @@ -67,14 +67,14 @@ func Buttons(user *spotify.PrivateUser) g.Node {
)
}

func Outcome(count int, err error) g.Node {
func Outcome(count int, err error, playlistUrl string) g.Node {
var o g.Node
if count == -1 {
o = Div()
} else if err != nil {
o = g.Text("Error: " + err.Error())
} else {
o = g.Text("Successfully synchronized " + strconv.Itoa(count) + " tracks to your Syncify playlist")
o = Span(g.Text("Successfully synchronized "+strconv.Itoa(count)+" tracks to your "), A(Class("text-green-500"), Href(playlistUrl), g.Text("Syncify playlist")))
}
return Div(ID("outcome"), Class("text-gray-500 text-center"), o)
}

0 comments on commit d360c4f

Please sign in to comment.