From d29d2695886bbd116232f63bbf8d19e62203e1e6 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Sun, 10 Feb 2019 17:59:15 +0100
Subject: [PATCH] Path

---
 README.md            |  2 +-
 terminis/terminis.py | 41 ++++++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 35e66bf..6d9eeb6 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ terminis [level]
 
 You can change keys by editing:
 * `%appdata%\Terminis\config.cfg` on Windows
-* `~/.local/share/Terminis/config.cfg` on Linux
+* `$XDG_CONFIG_HOME/Terminis/config.cfg` or `~/.config/Terminis/config.cfg` on Linux
 
 Acceptable values:
 * printable characters (`q`, `*`, ` `...)
diff --git a/terminis/terminis.py b/terminis/terminis.py
index 53a79ba..d39633b 100644
--- a/terminis/terminis.py
+++ b/terminis/terminis.py
@@ -14,15 +14,15 @@ import time
 import os
 import configparser
 
-
-WIN_DIR = "~/Appdata/Roaming/Terminis/"
-LINUX_DIR = "~/.local/share/"
-
-
+DIR_NAME = "Terminis"
 if sys.platform == "win32":
-    dir_path = os.path.expanduser(WIN_DIR)
+    DATA_PATH = os.environ.get("appdata", os.path.expanduser("~\Appdata\Roaming"))
+    CONFIG_PATH = DATA_PATH
 else:
-    dir_path = os.path.expanduser(LINUX_DIR)
+    DATA_PATH = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
+    CONFIG_PATH = os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
+DATA_PATH = os.path.join(DATA_PATH, DIR_NAME)
+CONFIG_PATH = os.path.join(CONFIG_PATH, DIR_NAME)
     
     
 class Rotation:
@@ -413,7 +413,7 @@ class Stats(Window):
     LINES_CLEARED_NAMES = ("", "SINGLE", "DOUBLE", "TRIPLE", "TETRIS")
     TITLE = "STATS"
     FILE_NAME = ".high_score"
-    file_path = os.path.join(dir_path, FILE_NAME)
+    FILE_PATH = os.path.join(DATA_PATH, FILE_NAME)
     
     def __init__(self, game, width, height, begin_x, begin_y, level):
         self.game = game
@@ -430,7 +430,7 @@ class Stats(Window):
         
     def load(self):
         try:
-            with open(self.file_path, "r") as f:
+            with open(self.FILE_PATH, "r") as f:
                 self.high_score = int(f.read())
         except:
             self.high_score = 0
@@ -497,9 +497,11 @@ class Stats(Window):
         else:
             self.refresh()
         
-    def save(self):
+    def save(self):   
+        if not os.path.exists(DATA_PATH):
+            os.mkdir(DATA_PATH)
         try:
-            with open(self.file_path, mode='w') as f:
+            with open(self.FILE_PATH, mode='w') as f:
                 f.write(str(self.high_score))
         except Exception as e:
             print("High score could not be saved:")
@@ -509,7 +511,7 @@ class Stats(Window):
 class Config(Window, configparser.SafeConfigParser):
     TITLE = "CONTROLS"
     FILE_NAME = "config.cfg"
-    file_path = os.path.join(dir_path, FILE_NAME)
+    FILE_PATH = os.path.join(CONFIG_PATH, FILE_NAME)
     
     def __init__(self, width, height, begin_x, begin_y):
         configparser.SafeConfigParser.__init__(self)
@@ -524,16 +526,18 @@ class Config(Window, configparser.SafeConfigParser):
         self.set("CONTROLS", "HOLD", "h")
         self.set("CONTROLS", "PAUSE", "p")
         self.set("CONTROLS", "QUIT", "q")
-        if os.path.exists(self.file_path):
-            self.read(self.file_path)
+        if os.path.exists(self.FILE_PATH):
+            self.read(self.FILE_PATH)
             for action, key in self.items("CONTROLS"):
                 if key == "":
                     self.set("CONTROLS", action, " ")
         else:
+            if not os.path.exists(CONFIG_PATH):
+                os.mkdir(CONFIG_PATH)
             try:
-                with open(self.file_path, 'w') as f:
+                with open(self.FILE_PATH, 'w') as f:
                     f.write(
-"""# Acceptable values are printable characters ("q", "*"...) and curses's constants name starting with "KEY_"
+"""# Acceptable values are printable characters ("q", "*", " "...) and curses's constants name starting with "KEY_"
 # See https://docs.python.org/3/library/curses.html?highlight=curses#constants
 
 """
@@ -705,11 +709,6 @@ def main():
     else:
         level = 1
         
-    try:
-        os.mkdir(dir_path)
-    except FileExistsError:
-        pass
-        
     with Screen() as scr:
         game = Game(scr, level)
         game.play()