diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index 2c6509ed..ea689a2d 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -1,3 +1,4 @@ +import glib import logging import os import threading @@ -18,12 +19,15 @@ from mopidy.utils.process import BaseThread logger = logging.getLogger('mopidy.backends.spotify.session_manager') +DEFAULT_CACHE_LOCATION = os.path.join(glib.get_user_cache_dir(), 'spotify') + # pylint: disable = R0901 # SpotifySessionManager: Too many ancestors (9/7) + class SpotifySessionManager(BaseThread, PyspotifySessionManager): cache_location = settings.SPOTIFY_CACHE_PATH - settings_location = settings.SPOTIFY_CACHE_PATH + settings_location = settings.SPOTIFY_CACHE_PATH or DEFAULT_CACHE_LOCATION appkey_file = os.path.join(os.path.dirname(__file__), 'spotify_appkey.key') user_agent = 'Mopidy %s' % get_version() diff --git a/mopidy/settings.py b/mopidy/settings.py index f3e012ed..f215ea42 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -237,7 +237,7 @@ SHOUTCAST_OUTPUT_ENCODER = u'lame mode=stereo bitrate=320' #: Path to the Spotify cache. #: #: Used by :mod:`mopidy.backends.spotify`. -SPOTIFY_CACHE_PATH = u'~/.mopidy/spotify_cache' +SPOTIFY_CACHE_PATH = u'' #: Your Spotify Premium username. #: