From af2bd35d74263e7513c57f1a354c63b03180fe46 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Sat, 14 Dec 2019 13:46:02 +0100
Subject: [PATCH] Moved data directory to globalconf

---
 maloja/__init__.py    | 14 --------------
 maloja/controller.py  |  2 +-
 maloja/fixexisting.py |  2 +-
 maloja/globalconf.py  | 13 +++++++++++++
 maloja/server.py      |  2 +-
 maloja/supervisor.py  |  2 +-
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/maloja/__init__.py b/maloja/__init__.py
index 44a1aab..6829b7f 100644
--- a/maloja/__init__.py
+++ b/maloja/__init__.py
@@ -53,17 +53,3 @@ config(
 		"autostart": False
 	}
 )
-
-
-### USER DATA FOLDER
-
-
-import os
-try:
-	DATA_DIR = os.environ["XDG_DATA_HOME"].split(":")[0]
-	assert os.path.exists(DATA_DIR)
-except:
-	DATA_DIR = os.path.join(os.environ["HOME"],".local/share/")
-
-DATA_DIR = os.path.join(DATA_DIR,"maloja")
-os.makedirs(DATA_DIR,exist_ok=True)
diff --git a/maloja/controller.py b/maloja/controller.py
index 794ca5c..7467e22 100755
--- a/maloja/controller.py
+++ b/maloja/controller.py
@@ -12,7 +12,7 @@ import pkg_resources
 from doreah.control import mainfunction
 from doreah.io import col
 
-from .__init__ import DATA_DIR
+from .globalconf import DATA_DIR
 from .backup import backup
 
 
diff --git a/maloja/fixexisting.py b/maloja/fixexisting.py
index a0de976..f376c08 100644
--- a/maloja/fixexisting.py
+++ b/maloja/fixexisting.py
@@ -1,5 +1,5 @@
 import os
-from .__init__ import DATA_DIR
+from .globalconf import DATA_DIR
 os.chdir(DATA_DIR)
 
 import re
diff --git a/maloja/globalconf.py b/maloja/globalconf.py
index 16764b4..1f2965b 100644
--- a/maloja/globalconf.py
+++ b/maloja/globalconf.py
@@ -1,4 +1,5 @@
 from doreah.settings import get_settings
+import os
 
 THUMBOR_SERVER, THUMBOR_SECRET = get_settings("THUMBOR_SERVER","THUMBOR_SECRET")
 try:
@@ -11,3 +12,15 @@ try:
 except:
 	USE_THUMBOR = False
 	log("Thumbor could not be initialized. Is libthumbor installed?")
+
+
+
+
+try:
+	DATA_DIR = os.environ["XDG_DATA_HOME"].split(":")[0]
+	assert os.path.exists(DATA_DIR)
+except:
+	DATA_DIR = os.path.join(os.environ["HOME"],".local/share/")
+
+DATA_DIR = os.path.join(DATA_DIR,"maloja")
+os.makedirs(DATA_DIR,exist_ok=True)
diff --git a/maloja/server.py b/maloja/server.py
index 90f1d31..fe281a4 100755
--- a/maloja/server.py
+++ b/maloja/server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import os
-from .__init__ import DATA_DIR
+from .globalconf import DATA_DIR
 os.chdir(DATA_DIR)
 
 
diff --git a/maloja/supervisor.py b/maloja/supervisor.py
index 5656858..5021e87 100644
--- a/maloja/supervisor.py
+++ b/maloja/supervisor.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 import os
-from .__init__ import DATA_DIR
+from .globalconf import DATA_DIR
 os.chdir(DATA_DIR)
 
 import subprocess