Merge pull request #357 from beaverking1212/credentials-cache

Improve credentials cache

Author: kingosticks

mopidy_spotify/backend.py

@@ -37,13 +37,18 @@ class SpotifyPlaybackProvider(backend.PlaybackProvider):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._cache_location = Extension().get_cache_dir(self.backend._config)
+        self._data_location = Extension().get_data_dir(self.backend._config)
         self._config = self.backend._config["spotify"]
 
+        self._credentials_dir = self._data_location / "credentials-cache"
+        if not self._credentials_dir.exists():
+            self._credentials_dir.mkdir(mode=0o700)
+
     def on_source_setup(self, source):
         for prop in ["username", "password", "bitrate"]:
             source.set_property(prop, str(self._config[prop]))
+        source.set_property("cache-credentials", self._credentials_dir)
         if self._config["allow_cache"]:
-            source.set_property("cache-credentials", self._cache_location)
             source.set_property("cache-files", self._cache_location)
             source.set_property(
                 "cache-max-size", self._config["cache_size"] * 1048576

tests/test_playback.py

@@ -35,12 +35,14 @@ def test_on_source_setup_sets_properties(config, provider):
     mock_source = mock.MagicMock()
     provider.on_source_setup(mock_source)
     spotify_cache_dir = backend.Extension.get_cache_dir(config)
+    spotify_data_dir = backend.Extension.get_data_dir(config)
+    cred_dir = spotify_data_dir / "credentials-cache"
 
     assert mock_source.set_property.mock_calls == [
         mock.call("username", "alice"),
         mock.call("password", "password"),
         mock.call("bitrate", "160"),
-        mock.call("cache-credentials", spotify_cache_dir),
+        mock.call("cache-credentials", cred_dir),
         mock.call("cache-files", spotify_cache_dir),
         mock.call("cache-max-size", 8589934592),
     ]
@@ -50,11 +52,14 @@ def test_on_source_setup_without_caching(config, provider):
     config["spotify"]["allow_cache"] = False
     mock_source = mock.MagicMock()
     provider.on_source_setup(mock_source)
+    spotify_data_dir = backend.Extension.get_data_dir(config)
+    cred_dir = spotify_data_dir / "credentials-cache"
 
     assert mock_source.set_property.mock_calls == [
         mock.call("username", "alice"),
         mock.call("password", "password"),
         mock.call("bitrate", "160"),
+        mock.call("cache-credentials", cred_dir),
     ]