sarsoo/spotfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated with new service reflecting spotframework model

Browse Source
This commit is contained in:
aj 2020-06-21 15:30:51 +01:00
parent e65525afca
commit 3089f25b59
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spotfm/maths/counter.py
View File

@ -1,8 +1,8 @@
from spotframework.net.network import Network as SpotifyNetwork from spotframework.net.network import Network as SpotifyNetwork
from spotframework.model.playlist import SpotifyPlaylist from spotframework.model.playlist import FullPlaylist
from spotframework.model.track import SpotifyTrack from spotframework.model.track import SimplifiedTrack
from spotframework.model.album import SpotifyAlbum from spotframework.model.album import SimplifiedAlbum
from spotframework.model.artist import SpotifyArtist from spotframework.model.artist import SimplifiedArtist
from spotframework.model.uri import Uri from spotframework.model.uri import Uri
from fmframework.net.network import Network as FMNetwork from fmframework.net.network import Network as FMNetwork
@ -34,7 +34,7 @@ class Counter:
def count_playlist(self, def count_playlist(self,
username: str = None, username: str = None,
uri: Uri = None, uri: Uri = None,
playlist: SpotifyPlaylist = None, playlist: FullPlaylist = None,
query_album=False, query_album=False,
query_artist=False) -> int: query_artist=False) -> int:
@ -54,28 +54,27 @@ class Counter:
tracks = [] tracks = []
for song in playlist.tracks: for song in playlist.tracks:
if isinstance(song, SpotifyTrack): if song.track.uri not in [i.track.uri for i in tracks]:
if song.uri not in [i.uri for i in tracks]:
if query_album: if query_album:
if song.album.uri not in [i.album.uri for i in tracks]: if song.track.album.uri not in [i.track.album.uri for i in tracks]:
tracks.append(song) tracks.append(song)
elif query_artist: elif query_artist:
if song.artists[0].uri not in [i.artists[0].uri for i in tracks]: if song.track.artists[0].uri not in [i.track.artists[0].uri for i in tracks]:
tracks.append(song) tracks.append(song)
else: else:
tracks.append(song) tracks.append(song)
for song in tracks: for song in tracks:
if query_album: if query_album:
scrobble_count += self.count_album(username=username, album=song.album) scrobble_count += self.count_album(username=username, album=song.track.album)
elif query_artist: elif query_artist:
scrobble_count += self.count_artist(username=username, artist=song.artists[0]) scrobble_count += self.count_artist(username=username, artist=song.track.artists[0])
else: else:
scrobble_count += self.count_track(username=username, track=song) scrobble_count += self.count_track(username=username, track=song.track)
return scrobble_count return scrobble_count
def count_track(self, username: str = None, uri: Uri = None, track: SpotifyTrack = None) -> int: def count_track(self, username: str = None, uri: Uri = None, track: SimplifiedTrack = None) -> int:
if uri is None and track is None: if uri is None and track is None:
raise ValueError('no track to count') raise ValueError('no track to count')
@ -96,7 +95,7 @@ class Counter:
logger.error(f'no album returned for {track}') logger.error(f'no album returned for {track}')
return 0 return 0
def count_album(self, username: str = None, uri: Uri = None, album: SpotifyAlbum = None) -> int: def count_album(self, username: str = None, uri: Uri = None, album: SimplifiedAlbum = None) -> int:
if uri is None and album is None: if uri is None and album is None:
raise ValueError('no album to count') raise ValueError('no album to count')
@ -117,7 +116,7 @@ class Counter:
logger.error(f'no album returned for {album}') logger.error(f'no album returned for {album}')
return 0 return 0
def count_artist(self, username: str = None, uri: Uri = None, artist: SpotifyArtist = None) -> int: def count_artist(self, username: str = None, uri: Uri = None, artist: SimplifiedArtist = None) -> int:
if uri is None and artist is None: if uri is None and artist is None:
raise ValueError('no artist to count') raise ValueError('no artist to count')