From b734948dcb2a649272dabfa70abef7282d669f72 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 22 Mar 2010 21:36:55 +0100 Subject: [PATCH] Use spotify_uri_to_int in LibspotifyTranslator and DespotifyTranslator, making both stateless --- mopidy/backends/despotify.py | 10 ++-------- mopidy/backends/libspotify.py | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/mopidy/backends/despotify.py b/mopidy/backends/despotify.py index 7920da13..6e4ccaec 100644 --- a/mopidy/backends/despotify.py +++ b/mopidy/backends/despotify.py @@ -8,6 +8,7 @@ from mopidy.backends import (BaseBackend, BaseCurrentPlaylistController, BaseLibraryController, BasePlaybackController, BaseStoredPlaylistsController) from mopidy.models import Artist, Album, Track, Playlist +from mopidy.utils import spotify_uri_to_int logger = logging.getLogger('mopidy.backends.despotify') @@ -114,15 +115,8 @@ class DespotifyStoredPlaylistsController(BaseStoredPlaylistsController): class DespotifyTranslator(object): - uri_to_id_map = {} - next_id = 0 - def to_mopidy_id(self, spotify_uri): - if spotify_uri not in self.uri_to_id_map: - this_id = self.next_id - self.next_id += 1 - self.uri_to_id_map[spotify_uri] = this_id - return self.uri_to_id_map[spotify_uri] + return spotify_uri_to_int(spotify_uri) def to_mopidy_artist(self, spotify_artist): return Artist( diff --git a/mopidy/backends/libspotify.py b/mopidy/backends/libspotify.py index 894e9b05..2672079e 100644 --- a/mopidy/backends/libspotify.py +++ b/mopidy/backends/libspotify.py @@ -12,6 +12,7 @@ from mopidy.backends import (BaseBackend, BaseCurrentPlaylistController, BaseLibraryController, BasePlaybackController, BaseStoredPlaylistsController) from mopidy.models import Artist, Album, Track, Playlist +from mopidy.utils import spotify_uri_to_int logger = logging.getLogger('mopidy.backends.libspotify') @@ -107,15 +108,8 @@ class LibspotifyStoredPlaylistsController(BaseStoredPlaylistsController): class LibspotifyTranslator(object): - uri_to_id_map = {} - next_id = 0 - def to_mopidy_id(self, spotify_uri): - if spotify_uri not in self.uri_to_id_map: - this_id = self.next_id - self.next_id += 1 - self.uri_to_id_map[spotify_uri] = this_id - return self.uri_to_id_map[spotify_uri] + return spotify_uri_to_int(spotify_uri) def to_mopidy_artist(self, spotify_artist): if not spotify_artist.is_loaded():