Remove Track.id usage in despotify and libspotify backends

mopidy/backends/despotify.py

@@ -9,7 +9,6 @@ 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')
 
@@ -122,10 +121,6 @@ class DespotifyStoredPlaylistsController(BaseStoredPlaylistsController):
 
 
 class DespotifyTranslator(object):
-    @classmethod
-    def to_mopidy_id(cls, spotify_uri):
-        return spotify_uri_to_int(spotify_uri)
-
     @classmethod
     def to_mopidy_artist(cls, spotify_artist):
         return Artist(
@@ -154,7 +149,6 @@ class DespotifyTranslator(object):
             date=date,
             length=spotify_track.length,
             bitrate=320,
-            id=cls.to_mopidy_id(spotify_track.get_uri()),
         )
 
     @classmethod

mopidy/backends/libspotify.py

@@ -13,7 +13,6 @@ 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
 
 import alsaaudio
 
@@ -119,10 +118,6 @@ class LibspotifyStoredPlaylistsController(BaseStoredPlaylistsController):
 
 
 class LibspotifyTranslator(object):
-    @classmethod
-    def to_mopidy_id(cls, spotify_uri):
-        return spotify_uri_to_int(spotify_uri)
-
     @classmethod
     def to_mopidy_artist(cls, spotify_artist):
         if not spotify_artist.is_loaded():
@@ -157,7 +152,6 @@ class LibspotifyTranslator(object):
             date=date,
             length=spotify_track.duration(),
             bitrate=320,
-            id=cls.to_mopidy_id(uri),
         )
 
     @classmethod

mopidy/utils.py

@@ -58,52 +58,6 @@ def unpickle_connection(pickled_connection):
     (func, args) = pickle.loads(pickled_connection)
     return func(*args)
 
-def spotify_uri_to_int(uri, output_bits=31):
-    """
-    Stable one-way translation from Spotify URI to 31-bit integer.
-
-    Spotify track URIs has 62^22 possible values, which requires 131 bits of
-    storage. The original MPD server uses 32-bit unsigned integers for track
-    IDs. GMPC seems to think the track ID is a signed integer, thus we use 31
-    output bits.
-
-    In other words, this function throws away 100 bits of information. Since we
-    only use the track IDs to identify a track within a single Mopidy instance,
-    this information loss is acceptable. The chances of getting two different
-    tracks with the same track ID loaded in the same Mopidy instance is still
-    rather slim. 1 to 2,147,483,648 to be exact.
-
-    Normal usage, with data loss::
-
-        >>> spotify_uri_to_int('spotify:track:5KRRcT67VNIZUygEbMoIC1')
-        624351954
-
-    No data loss, may be converted back into a Spotify URI::
-
-        >>> spotify_uri_to_int('spotify:track:5KRRcT67VNIZUygEbMoIC1',
-        ...     output_bits=131)
-        101411513484007705241035418492696638725L
-
-    :param uri: Spotify URI on the format ``spotify:track:*``
-    :type uri: string
-    :param output_bits: number of bits of information kept in the return value
-    :type output_bits: int
-    :rtype: int
-    """
-
-    CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-    BITS_PER_CHAR = 6 # int(math.ceil(math.log(len(CHARS), 2)))
-
-    key = uri.split(':')[-1]
-    full_id = 0
-    for i, char in enumerate(key):
-        full_id ^= CHARS.index(char) << BITS_PER_CHAR * i
-    compressed_id = 0
-    while full_id != 0:
-        compressed_id ^= (full_id & (2 ** output_bits - 1))
-        full_id >>= output_bits
-    return int(compressed_id)
-
 def parse_m3u(file_path):
     """
     Convert M3U file list of uris