fix: cleanup configuration file location, especially on windows

AFM-analysis · Oct 8, 2020 · 537f704 · 537f704
1 parent d8ce596
commit 537f704
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/.appveyor/pyjibe.iss_dummy b/.appveyor/pyjibe.iss_dummy
@@ -3,8 +3,8 @@
 
 #define MyAppName "PyJibe"
 #define MyAppVersion "0.1.0"
-#define MyAppPublisher "Paul Müller"
-#define MyAppURL "https://gucklab.com"
+#define MyAppPublisher "AFM-Analysis"
+#define MyAppURL "https://pyjibe.readthedocs.io"
 #define MyAppExeName "pyjibe_ui.exe"
 #define MyAppPlatform "win32"
 #define MyAppDir = SourcePath + "..\dist\pyjibe\"
@@ -21,8 +21,9 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={localappdata}\{#MyAppName}
+DefaultDirName={localappdata}\{#MyAppPublisher}{#MyAppName}
 DisableDirPage=yes
+UsePreviousAppDir=false
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 OutputBaseFilename={#MyAppName}_{#MyAppVersion}_{#MyAppPlatform}_setup

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 0.8.3
  - fix: main window not focused after startup
+ - fix: Windows installation location was confusing and did
+   not coincide configuration file location
 0.8.2
  - setup: bump matplotlib to >=3
    (NavigationToolbar2QT modifications)

diff --git a/pyjibe/fd/rating_base.py b/pyjibe/fd/rating_base.py
@@ -8,8 +8,9 @@
 import nanite.rate.rater
 
 
+_cfg_dir = appdirs.user_config_dir(appname="PyJibe", appauthor="AFM-Analysis")
 #: Rating configuration directory
-CFG_DIR = pathlib.Path(appdirs.user_config_dir(appname="PyJibe")) / "rating"
+CFG_DIR = pathlib.Path(_cfg_dir) / "rating"
 #: Path to main rating configuration file
 CFG_PATH = CFG_DIR / "rating_schemes.txt"
 

diff --git a/pyjibe/settings.py b/pyjibe/settings.py
@@ -4,8 +4,10 @@
 
 import appdirs
 
-#: default settings file name
-NAME = "pyjibe.cfg"
+#: application name
+NAME = "PyJibe"
+#: application author
+ORG = "AFM-Analysis"
 
 #: default configuration parameters
 DEFAULTS = {}
@@ -14,13 +16,14 @@
 class SettingsFile(object):
     """Manages a settings file in the user's config dir"""
 
-    def __init__(self, name=NAME, defaults=DEFAULTS, directory=None):
+    def __init__(self, name=NAME, org=ORG, defaults=DEFAULTS, directory=None):
         """Initialize settings file (create if it does not exist)"""
         if directory is None:
-            directory = appdirs.user_config_dir()
-        fname = pathlib.Path(directory) / name
+            directory = appdirs.user_config_dir(appname=name, appauthor=org)
+        fname = pathlib.Path(directory) / (name.replace(" ", "_") + ".cfg")
         # create file if not existent
         if not fname.exists():
+            fname.parent.mkdir(exist_ok=True, parents=True)
             # Create the file
             fname.open("w").close()