1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
diff -Naur ./Superpaper-1.1.1.orig/superpaper.pyw ./Superpaper-1.1.1/superpaper.pyw
--- ./Superpaper-1.1.1.orig/superpaper.pyw 2019-05-19 10:46:28.018404320 -0400
+++ ./Superpaper-1.1.1/superpaper.pyw 2019-05-19 10:50:10.335921834 -0400
@@ -50,11 +50,14 @@
PATH = os.path.dirname(os.path.realpath(sys.executable))
else:
PATH = os.path.dirname(os.path.realpath(__file__))
+CONF_PATH = os.path.expanduser( "~/.config/superpaper" )
# Derivative paths
-TEMP_PATH = PATH + "/temp/"
+TEMP_PATH = CONF_PATH + "/temp/"
if not os.path.isdir(TEMP_PATH):
- os.mkdir(TEMP_PATH)
-PROFILES_PATH = PATH + "/profiles/"
+ os.makedirs(TEMP_PATH, exist_ok=True)
+PROFILES_PATH = CONF_PATH + "/profiles/"
+if not os.path.isdir(PROFILES_PATH):
+ os.makedirs(PROFILES_PATH, exist_ok=True)
TRAY_TOOLTIP = "Superpaper"
TRAY_ICON = PATH + "/resources/default.png"
VERSION_STRING = "1.1.1"
@@ -71,7 +74,7 @@
DEBUG = True
# sys.stdout = open(PATH + "/log.txt", "w")
g_logger.setLevel(logging.INFO)
- fileHandler = logging.FileHandler("{0}/{1}.log".format(PATH, "log"),
+ fileHandler = logging.FileHandler("{0}/{1}.log".format(CONF_PATH, "log"),
mode="w")
g_logger.addHandler(fileHandler)
consoleHandler = logging.StreamHandler()
@@ -104,7 +107,7 @@
def parse_settings(self):
global DEBUG, LOGGING, g_set_command_string
global g_logger, fileHandler, consoleHandler
- fname = os.path.join(PATH, "general_settings")
+ fname = os.path.join(CONF_PATH, "general_settings")
if os.path.isfile(fname):
f = open(fname, "r")
try:
@@ -123,7 +126,7 @@
sys.excepthook = custom_exception_handler
fileHandler = logging.FileHandler(
"{0}/{1}.log"
- .format(PATH, "log"),
+ .format(CONF_PATH, "log"),
mode="w")
g_logger.addHandler(fileHandler)
consoleHandler = logging.StreamHandler()
@@ -185,7 +188,7 @@
f.close()
def Save(self):
- fname = os.path.join(PATH, "general_settings")
+ fname = os.path.join(CONF_PATH, "general_settings")
f = open(fname, "w")
if self.logging:
@@ -2018,7 +2021,7 @@
current_settings = GeneralSettingsData()
show_help = current_settings.show_help
- fname = os.path.join(PATH, "general_settings")
+ fname = os.path.join(CONF_PATH, "general_settings")
f = open(fname, "w")
if self.cb_logging.GetValue():
f.write("logging=true\n")
|