Fix a bug with saving/importing cfg in CLI

Author: vikdevelop

src/savedesktop.in

@@ -26,6 +26,7 @@ import argparse
 import signal
 import locale
 import gettext
+from datetime import date
 
 VERSION = '@VERSION@'
 pkgdatadir = '@pkgdatadir@'
@@ -46,7 +47,7 @@ parser = argparse.ArgumentParser()
 parser.add_argument("--background", action="store_true", help="Start periodic saving")
 parser.add_argument("--sync", action="store_true", help="Start synchronization")
 parser.add_argument("--save-now", action="store_true", help="Save a configuration using UI parameters such as periodic saving folder, file name format and password for encryption.")
-parser.add_argument("--save-without-archive", type=str, help="Save the configuration without an archive", dest="FOLDER_PATH")
+parser.add_argument("--save-without-archive", type=str, help="Save the configuration without creating an archive", dest="FOLDER_PATH")
 parser.add_argument("--import-config", help="Import a configuration from a file (*.sd.zip or *.sd.tar.gz) or folder", type=str, dest="CFG_ARCHIVE_PATH")
 cmd = parser.parse_args()
 
@@ -62,22 +63,16 @@ elif cmd.save_now: # save a configuration using UI parameters
     pb = PeriodicBackups()
     pb.run(now=True)
 elif cmd.FOLDER_PATH: # save a configuration without an archive
-    folder_path = cmd.FOLDER_PATH
-    os.makedirs(f"{CACHE}/save_config", exist_ok=True)
-    os.chdir(f"{CACHE}/save_config")
-    os.system(f"python3 {init_dir}/config.py --save")
-    print(f"moving the configuration folder to the {folder_path} folder")
-    os.system(f"echo > {CACHE}/save_config/SELECT_THIS_FILE_TO_IMPORT_CFG && mv {CACHE}/save_config '{cmd.FOLDER_PATH}/configuration_{date.today()}'")
+    archive_mode = "--create"
+    archive_name = f"{cmd.FOLDER_PATH}/Configuration-{date.today()}"
+
+    os.makedirs(archive_name, exist_ok=True)
+    subprocess.run([sys.executable, "-m", "savedesktop.core.archive", archive_mode, archive_name], env={**os.environ, "PYTHONPATH": f"{pkgdatadir}"})
 elif cmd.CFG_ARCHIVE_PATH: # import a configuration from a file, or folder
-    file_path = cmd.CFG_ARCHIVE_PATH
     if not os.path.exists(file_path):
         print(f"File not found: {file_path}")
         exit(1)
 
-    shutil.rmtree(os.path.join(CACHE, "import_config"), ignore_errors=True)
-    os.makedirs(os.path.join(CACHE, "import_config"), exist_ok=True)
-    os.chdir(os.path.join(CACHE, "import_config"))
-
     if file_path.endswith('.sd.zip'):
         os.system(f"unzip {file_path}")
     elif file_path.endswith('.sd.tar.gz'):
@@ -88,7 +83,9 @@ elif cmd.CFG_ARCHIVE_PATH: # import a configuration from a file, or folder
         print("Unsupported file type. Use *.sd.zip, *.sd.tar.gz or folder which contains the \".folder.sd\" file.")
         exit(1)
 
-    subprocess.run([sys.executable, "-m", "savedesktop.core.config", "--import_"], check=True, env={**os.environ, "PYTHONPATH": "/app/share/savedesktop"})
+    archive_mode = "--unpack"
+    archive_name = f"{cmd.CFG_ARCHIVE_PATH}"
+    subprocess.run([sys.executable, "-m", "savedesktop.core.archive", archive_mode, archive_name], env={**os.environ, "PYTHONPATH": f"{pkgdatadir}"})
 else: # show the app window
     import gi