Merge pull request #22 from mylinuxforwork/21-move-dotfilesjson

dotfiles.json moved to XDG-HOME-CONFIG

Author: mylinuxforwork

src/_settings.py

@@ -15,7 +15,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import os, pathlib, logging
+import os, shutil, pathlib, logging
 from gi.repository import Gtk, Gdk, Gio, GLib, Adw
 
 # App Id
@@ -32,6 +32,7 @@
 prepared_folder_name = "prepared"
 backup_folder_name = "backup"
 dotfiles_folder_name = ".mydotfiles"
+dotfiles_json_name = "dotfiles.json"
 
 # Folders
 home_folder = GLib.get_home_dir() + "/"
@@ -112,6 +113,12 @@ def run_setup():
         pathlib.Path(config_folder).mkdir(parents=True, exist_ok=True)
         printLog(config_folder + " created (if not exists)")
 
+    # Update from older versions
+    # Move dotfiles.json
+    if os.path.exists(get_installed_dotfiles_folder() + dotfiles_json_name):
+        shutil.move(get_installed_dotfiles_folder() + dotfiles_json_name, config_folder)
+        printLog("Legacy " + dotfiles_json_name + " found. Moved to " + config_folder)
+
 # Print log to the terminal
 def printLog(msg,cat='m'):
     match cat:

src/classes/installation.py

@@ -77,7 +77,7 @@ def install_dotfiles(self):
             # Write dotfiles config file to dotfiles folder
             dotfiles_json = {}
             dotfiles_json["active"] = self.props.id
-            with open(get_installed_dotfiles_folder() + 'dotfiles.json', 'w', encoding='utf-8') as f:
+            with open(config_folder + dotfiles_json_name, 'w', encoding='utf-8') as f:
                 json.dump(dotfiles_json, f, ensure_ascii=False, indent=4)
             printLog(self.props.id + " set as active dotfiles")
 

src/classes/loadconfiguration.py

@@ -252,8 +252,8 @@ def load_installed_dotfiles(self):
                 item.source = dot_json["source"]
                 item.subfolder = dot_json["subfolder"]
 
-                if os.path.exists(get_installed_dotfiles_folder() + "dotfiles.json"):
-                    installed_json = json.load(open(get_installed_dotfiles_folder() + "/dotfiles.json"))
+                if os.path.exists(config_folder + dotfiles_json_name):
+                    installed_json = json.load(open(config_folder + dotfiles_json_name))
                     if installed_json["active"] == dot_json["id"]:
                         item.active = True