Fix a bug with updating home path in dconf-settings.ini and code cleanup

Author: vikdevelop

src/core/archive.py

@@ -73,6 +73,7 @@ def _create_archive(self):
             cmd.insert(5, f"-p{password}")
 
         proc = subprocess.run(cmd, capture_output=True, text=True)
+        print(proc.stdout)
 
         if proc.returncode not in (0, 1):
             # 0 = everything is OK, 1 = warning (e.g. file not found)
@@ -134,18 +135,20 @@ def _unpack_zip_archive(self):
                 raise ValueError(first_error or "Wrong password")
             print("Checking password is completed.")
 
-        subprocess.run(
+        cmd = subprocess.run(
             ['7z', 'x', '-y', f'-p{password}', self.import_file, f'-o{TEMP_CACHE}'],
-            capture_output=False, text=True, check=True
+            capture_output=True, text=True, check=True
         )
+        print(cmd.stdout)
 
     # Unpack a legacy archive with Tarball (for backward compatibility)
     def _unpack_tar_archive(self):
-        subprocess.run(["tar", "-xzf", self.import_file, "-C", f"{TEMP_CACHE}"],capture_output=True, text=True, check=True)
+        cmd = subprocess.run(["tar", "-xzf", self.import_file, "-C", f"{TEMP_CACHE}"],capture_output=True, text=True, check=True)
+        print(cmd.stdout)
 
     # Replace original /home/$USER path with actual path in the dconf-settings.ini file and other XML files
     def _replace_home_in_files(self, root, home, patterns=(".xml", ".ini")):
-        regex = re.compile(r"/home/[^/]+/")
+        regex = re.compile(r"(?:/var)?/home/[^/]+/")
         for dirpath, _, filenames in os.walk(root):
             for filename in filenames:
                 if filename.endswith(patterns):

src/core/config.py

@@ -213,7 +213,7 @@ def __init__(self):
     # Create an autostart file to install Flatpaks from a list after the next login 
     def create_flatpak_autostart(self):
         os.system(f"cp /app/share/savedesktop/savedesktop/core/flatpaks_installer.py {CACHE}/")
-        if not os.path.exists(f"{DATA}/savedesktop-synchronization.sh") or not os.path.exists(f"{CACHE}/syncing/sync_status"):
+        if not os.path.exists(f"{DATA}/savedesktop-synchronization.sh"):
             if not os.path.exists(f"{home}/.config/autostart"): 
                 os.mkdir(f"{home}/.config/autostart")
             if not os.path.exists(f"{home}/.config/autostart/io.github.vikdevelop.SaveDesktop.Flatpak.desktop"):

src/core/synchronization.py

@@ -158,9 +158,6 @@ def done(self):
         if not settings["manually-sync"]:
             with open(f"{DATA}/sync-info.json", "w") as s:
                 json.dump({"last-synced": date.today().isoformat()}, s)
-                
-        if os.path.exists(f"{CACHE}/temp_file"):
-            os.remove(f"{CACHE}/temp_file")
 
         # Send a notification about finished synchronization
         os.system(f"notify-send 'Save Desktop Synchronization ({self.file})' '{_('The configuration has been applied!')} {_('Changes will only take effect after the next login')}' -i io.github.vikdevelop.SaveDesktop-symbolic")

src/gui/window.py

@@ -585,7 +585,8 @@ def _identify_file_type(self):
 
     def _call_archive_command(self):
         try:
-            subprocess.run([sys.executable, "-m", "savedesktop.core.archive", self.archive_mode, self.archive_name], check=True, capture_output=True, text=True, env={**os.environ, "PYTHONPATH": f"{app_prefix}"})
+            cmd = subprocess.run([sys.executable, "-m", "savedesktop.core.archive", self.archive_mode, self.archive_name], check=True, capture_output=True, text=True, env={**os.environ, "PYTHONPATH": f"{app_prefix}"})
+            print(cmd.stdout)
         except subprocess.CalledProcessError as err:
             e = err.stderr
             GLib.idle_add(self.show_err_msg, e)
@@ -753,3 +754,6 @@ def on_close(self, w):
         settings["window-size"] = self.get_default_size()
         settings["maximized"] = self.is_maximized()
         settings["filename"] = self.saveEntry.get_text()
+
+        if os.path.exists(f"{CACHE}/expand_pb_row"):
+            os.remove(f"{CACHE}/expand_pb_row")