Skip to content

Commit

Permalink
Added support for paging playlist edit calls
Browse files Browse the repository at this point in the history
It also addresses the comments in mopidy#236
  • Loading branch information
blacklight authored and girst committed Nov 3, 2020
1 parent 81e753d commit 3e8cf22
Showing 1 changed file with 24 additions and 16 deletions.
40 changes: 24 additions & 16 deletions mopidy_spotify/playlists.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@


class SpotifyPlaylistsProvider(backend.PlaylistsProvider):
# Maximum number of items accepted by the Spotify Web API
_chunk_size = 100

def __init__(self, backend):
self._backend = backend
self._timeout = self._backend._config["spotify"]["timeout"]
Expand Down Expand Up @@ -55,6 +58,11 @@ def _get_user_and_playlist_id_from_uri(uri):
playlist_id = uri.split(':')[-1]
return user_id, playlist_id

@staticmethod
def partitions(lst, n):
for i in range(0, len(lst), n):
yield lst[i:i+n]

def _playlist_edit(self, playlist, method, **kwargs):
user_id, playlist_id = self._get_user_and_playlist_id_from_uri(playlist.uri)
url = f'users/{user_id}/playlists/{playlist_id}/tracks'
Expand Down Expand Up @@ -91,7 +99,8 @@ def refresh(self):
def create(self, name):
logger.info(f'Creating playlist {name}')
url = f'users/{web_client.user_id}/playlists'
response = self._backend._web_client.post(url)
response = self._backend._web_client.post(url, json={'name': name})
self.refresh()
return self.lookup(response['uri'])

def delete(self, uri):
Expand All @@ -116,12 +125,10 @@ def save(self, playlist):
logger.info(f'Removing {len(removed_uris)} tracks from playlist ' +
f'{saved_playlist.name}: {removed_uris}')

cur_tracks = {
track.uri: track
for track in self._playlist_edit(
playlist, method='delete',
tracks=[{'uri': uri for uri in removed_uris}]).tracks
}
for chunk in self.partitions(removed_uris, self._chunk_size):
saved_playlist = self._playlist_edit(saved_playlist, method='delete',
tracks=[{'uri': uri for uri in removed_uris}])
cur_tracks = {track.uri: track for track in saved_playlist.tracks}

# Add tracks logic
position = None
Expand All @@ -138,14 +145,15 @@ def save(self, playlist):

if added_uris:
for pos, uris in added_uris.items():
logger.info(f'Adding {uris} to playlist {playlist.name}')
logger.info(f'Adding {uris} to playlist {saved_playlist.name}')
processed_tracks = 0

for chunk in self.partitions(uris):
saved_playlist = self._playlist_edit(saved_playlist, method='post',
uris=chunk, position=pos+processed_tracks)

cur_tracks = {
track.uri: track
for track in self._playlist_edit(
playlist, method='post',
uris=uris, position=pos).tracks
}
cur_tracks = {track.uri: track for track in saved_playlist.tracks}
processed_tracks += len(chunk)

# Swap tracks logic
cur_tracks_by_uri = {}
Expand All @@ -161,12 +169,12 @@ def save(self, playlist):
cur_pos = cur_tracks_by_uri[track.uri]
new_pos = i+1
logger.info(f'Moving item position [{cur_pos}] to [{new_pos}] in ' +
f'playlist {playlist.name}')
f'playlist {saved_playlist.name}')

cur_tracks = {
track.uri: track
for track in self._playlist_edit(
playlist, method='put',
saved_playlist, method='put',
range_start=cur_pos, insert_before=new_pos).tracks
}

Expand Down

0 comments on commit 3e8cf22

Please sign in to comment.