From d88f66798f72bcb7de99186d24523490a5436996 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sun, 31 May 2020 21:35:24 +1200 Subject: [PATCH] Removing data_dir in favor of Extension.get_data_dir, #547 --- docker-compose.example.yml | 1 + mopidy_iris/__init__.py | 2 +- mopidy_iris/core.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index b53506f2..0ea0413b 100755 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -22,6 +22,7 @@ services: # Uncomment these lines to use a host-managed development build #- ./mopidy_iris:/iris/mopidy_iris #- ./IRIS_VERSION:/iris/IRIS_VERSION + - ./docker/data:/var/lib/mopidy/iris - ./docker/mopidy.conf:/config/mopidy.conf - HOST_MUSIC_DIRECTORY:/var/lib/mopidy/media - HOST_SNAPCAST_TEMP:/tmp diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py index 8c202204..831349c6 100755 --- a/mopidy_iris/__init__.py +++ b/mopidy_iris/__init__.py @@ -30,7 +30,7 @@ class Extension(ext.Extension): schema["spotify_authorization_url"] = config.String() schema["lastfm_authorization_url"] = config.String() schema["genius_authorization_url"] = config.String() - schema["data_dir"] = config.String() + schema["data_dir"] = config.String() # Deprecated return schema def setup(self, registry): diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py index 053f7d31..6e4c94fb 100755 --- a/mopidy_iris/core.py +++ b/mopidy_iris/core.py @@ -72,7 +72,7 @@ class IrisCore(pykka.ThreadingActor): # @return Dict ## def load_from_file(self, name): - file_path = Path(self.config["iris"]["data_dir"]) / ("%s.pkl" % name) + file_path = Extension.get_data_dir(self.config) / ("%s.pkl" % name) try: with file_path.open("rb") as f: @@ -90,7 +90,7 @@ class IrisCore(pykka.ThreadingActor): # @return void ## def save_to_file(self, dict, name): - file_path = Path(self.config["iris"]["data_dir"]) / ("%s.pkl" % name) + file_path = Extension.get_data_dir(self.config) / ("%s.pkl" % name) try: with file_path.open("wb") as f: