Moved data directory to globalconf

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)

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
 
 

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

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)

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)
 
 

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