niklas/ripsort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved clients into seperate package & fixed error in playlist sync

Browse Source
This commit is contained in:
Niklas Kapelle
2026-05-11 22:46:55 +02:00
parent f06a2d82e9
commit 81a9fe5bfc
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
internal/syncPlaylists.go
View File

@@ -2,28 +2,29 @@ package ripsort
import (
"log/slog"
"os"
"regexp"
"git.kapelle.org/niklas/ripsort/internal/playlist"
"git.kapelle.org/niklas/ripsort/internal/clients/navidrome"
"git.kapelle.org/niklas/ripsort/internal/clients/spotify"
)
func SyncPlaylists(spotifyClientID, spotifyClientSecret, navidromeBase, navidromeUser, navidromePass string) {
spotifyClient, err := playlist.NewSpotifyClient(spotifyClientID, spotifyClientSecret)
func SyncPlaylists(spotifyClientID, spotifyClientSecret, navidromeBase, navidromeUser, navidromePass string) error {
spotifyClient, err := spotify.NewSpotifyClient(spotifyClientID, spotifyClientSecret)
if err != nil {
slog.Error("Failed to create spotify client", "err", err)
os.Exit(1)
return err
}
navidromeClient, err := playlist.NewNavidromeClient(navidromeBase, navidromeUser, navidromePass)
navidromeClient, err := navidrome.NewNavidromeClient(navidromeBase, navidromeUser, navidromePass)
if err != nil {
slog.Error("Failed to create navidrome client", "err", err)
os.Exit(1)
return err
}
allPlaylists, err := navidromeClient.GetPlaylists()
for _, pl := range allPlaylists {
// Only sync playlists that have a spotify URL in the comment
spotifyPlaylistID := spotifyIDForPlaylist(&pl)
if spotifyPlaylistID == "" {
continue
@@ -31,15 +32,23 @@ func SyncPlaylists(spotifyClientID, spotifyClientSecret, navidromeBase, navidrom
slog.Info("Syncing playlist", "name", pl.Name)
err = syncPlaylists(spotifyClient, navidromeClient, spotifyPlaylistID, pl.ID)
spotifyPlaylist, err := spotifyClient.GetPlaylist(spotifyPlaylistID)
if err != nil {
slog.Error("Failed to fetch spotify playlist", "id", spotifyPlaylistID)
return err
}
err = syncPlaylists(navidromeClient, spotifyPlaylist, &pl)
if err != nil {
slog.Error("Failed to sync playlist", "name", pl.Name, "err", err)
os.Exit(1)
return err
}
}
return nil
}
func spotifyIDForPlaylist(playlist *playlist.NavidromePlaylist) string {
func spotifyIDForPlaylist(playlist *navidrome.NavidromePlaylist) string {
var re = regexp.MustCompile(`(?m)https:\/\/open\.spotify\.com\/playlist\/([a-zA-Z0-9]*)`)
matches := re.FindAllStringSubmatch(playlist.Comment, -1)
@@ -50,13 +59,8 @@ func spotifyIDForPlaylist(playlist *playlist.NavidromePlaylist) string {
return matches[0][1]
}
func syncPlaylists(sp *playlist.SpotifyClient, nd *playlist.NavidromeClient, spotifyid string, navidromeID string) error {
spotifyPlaylist, err := sp.GetPlaylist(spotifyid)
if err != nil {
return err
}
navidromeFullPlaylist, err := nd.GetPlaylist(navidromeID)
func syncPlaylists(nd *navidrome.NavidromeClient, spotifyPlaylist *spotify.SpotifyPlaylist, ndPlaylist *navidrome.NavidromePlaylist) error {
tracks, err := nd.GetPlaylistTracks(ndPlaylist.ID)
if err != nil {
return err
}
@@ -64,7 +68,7 @@ func syncPlaylists(sp *playlist.SpotifyClient, nd *playlist.NavidromeClient, spo
songsToAdd := []string{}
for _, spotifySong := range spotifyPlaylist.Items.Items {
if ndPlaylistContainsSong(navidromeFullPlaylist, spotifySong.Item.ID) {
if ndPlaylistContainsSong(tracks, spotifySong.Item.ID) {
slog.Debug("Track already in playlist", "id", spotifySong.Item.ID)
continue
}
@@ -91,8 +95,8 @@ func syncPlaylists(sp *playlist.SpotifyClient, nd *playlist.NavidromeClient, spo
return nil
}
slog.Info("Adding songs to playlist", "count", len(songsToAdd), "playlist", navidromeFullPlaylist.Name)
err = nd.AddTracks(navidromeID, songsToAdd)
slog.Info("Adding songs to playlist", "count", len(songsToAdd))
err = nd.AddTracks(ndPlaylist.ID, songsToAdd)
if err != nil {
slog.Error("Failed to add songs", "err", err)
}
@@ -100,8 +104,8 @@ func syncPlaylists(sp *playlist.SpotifyClient, nd *playlist.NavidromeClient, spo
return nil
}
func ndPlaylistContainsSong(pl *playlist.NavidromePlaylist, spotifyID string) bool {
for _, song := range pl.Tracks {
func ndPlaylistContainsSong(tracks []navidrome.NavidromePlaylistTrack, spotifyID string) bool {
for _, song := range tracks {
tag := song.CustomTags["spotifyid"]
if tag == nil || len(tag) == 0 {