From 6225201fc77160d76bfcd34bfd1d1560930e5d08 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sat, 2 Nov 2019 08:02:50 +1300
Subject: [PATCH] Adding data_dir to contain Iris-specifc data (just commands
 library at this time)

---
 .gitignore              |  1 +
 mopidy_iris/__init__.py |  1 +
 mopidy_iris/core.py     | 12 ++++--------
 mopidy_iris/ext.conf    |  1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f1c4b489..1e97ddd2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ npm-debug.log
 .idea
 venv
 docker/mopidy.conf
+docker/data/
 docker-compose.yml
diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py
index e06e02f8..4a46ee40 100755
--- a/mopidy_iris/__init__.py
+++ b/mopidy_iris/__init__.py
@@ -37,6 +37,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()
         return schema
 
     def setup(self, registry):
diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py
index e84350fd..47db7c93 100755
--- a/mopidy_iris/core.py
+++ b/mopidy_iris/core.py
@@ -62,9 +62,7 @@ class IrisCore(pykka.ThreadingActor):
     # @return void
     ##
     def save_to_file(self, dict, name):
-
-        # Build path to our special Iris folder
-        path = self.config['core'].get('cache_dir')+'/iris/'
+        path = self.config['iris'].get('data_dir')
 
         # Create the folder if it doesn't yet exist
         if not os.path.exists(path):
@@ -72,7 +70,7 @@ class IrisCore(pykka.ThreadingActor):
 
         # And now open the file, and drop in our dict
         try:
-            with open(path + name + '.pkl', 'wb') as f:
+            with open(path + '/' + name + '.pkl', 'wb') as f:
                 pickle.dump(dict, f, pickle.HIGHEST_PROTOCOL)
         except Exception:
             return False
@@ -85,12 +83,10 @@ class IrisCore(pykka.ThreadingActor):
     # @return Dict
     ##
     def load_from_file(self, name):
-
-        # Build path to our special Iris folder
-        path = self.config['core'].get('cache_dir')+'/iris/'
+        path = self.config['iris'].get('data_dir')
 
         try:
-            with open(path + name + '.pkl', 'rb') as f:
+            with open(path + '/' + name + '.pkl', 'rb') as f:
                 return pickle.load(f)
         except Exception:
             return {}
diff --git a/mopidy_iris/ext.conf b/mopidy_iris/ext.conf
index 0e308beb..b22dab8f 100755
--- a/mopidy_iris/ext.conf
+++ b/mopidy_iris/ext.conf
@@ -5,3 +5,4 @@ locale = en_NZ
 spotify_authorization_url = https://jamesbarnsley.co.nz/iris/auth_spotify.php
 lastfm_authorization_url = https://jamesbarnsley.co.nz/iris/auth_lastfm.php
 genius_authorization_url = https://jamesbarnsley.co.nz/iris/auth_genius.php
+data_dir = $XDG_DATA_DIR/iris
\ No newline at end of file