Release 3.4 (stable) (#313)

Author: vikdevelop

flatpak/io.github.vikdevelop.SaveDesktop.desktop

@@ -21,6 +21,6 @@ Comment[ca]=Desa la configuració actual del vostre entorn d'escriptori
 Comment[hi]=अपना डेस्कटॉप विन्यास सहेजें
 Comment[pt]=Grave a sua configuração da área de trabalho
 Comment[fi]=Tallenna työpöytäsi määritys
-Exec=run.sh
+Exec=savedesktop
 Type=Application
 Icon=io.github.vikdevelop.SaveDesktop

flatpak/io.github.vikdevelop.SaveDesktop.gschema.xml

@@ -2,7 +2,7 @@
 <schemalist>
 	<schema id="io.github.vikdevelop.SaveDesktop" path="/io/github/vikdevelop/SaveDesktop/">
 		<key name="window-size" type="(ii)">
-			<default>(750,540)</default>
+			<default>(555, 584)</default>
 			<summary>Window size</summary>
 		</key>
 		<key name="maximized" type="b">
@@ -67,10 +67,6 @@
 		  <default>''</default>
 		  <summary>File for synchronization with other computers in the network</summary>
 		</key>
-		<key name="url-for-syncing" type="s">
-		  <default>''</default>
-		  <summary>URL of local directory to be get file for importing configuration</summary>
-		</key>
 		<key name="periodic-import" type="s">
 		  <choices>
 				<choice value="Never2"/>
@@ -86,6 +82,10 @@
 		  <default>false</default>
 		  <summary>Manually sync</summary>
 		</key>
+		<key name="bidirectional-sync" type="b">
+		    <default>true</default>
+		    <summary>Enable/Disable bidirectional synchronization</summary>
+		</key>
 		<key name="disabled-flatpak-apps-data" type="as">
 		  <default>[]</default>
 		  <summary>Select, what Flatpak applications data will be saved</summary>

io.github.vikdevelop.SaveDesktop.yaml

@@ -2,7 +2,7 @@ app-id: io.github.vikdevelop.SaveDesktop
 runtime: org.gnome.Platform
 runtime-version: '46'
 sdk: org.gnome.Sdk
-command: run.sh
+command: savedesktop
 finish-args:
     - --share=ipc
     - --share=network
@@ -59,7 +59,7 @@ modules:
   - name: savedesktop
     buildsystem: simple
     build-commands:
-       - install -Dm755 -t /app/bin run.sh
+       - install -Dm755 -t /app/bin savedesktop
        - cp -R src/* /app
        - install -D -t /app/share build-beta.sh
        - install -D -t /app/share/applications flatpak/io.github.vikdevelop.SaveDesktop.desktop

native/install_native.sh

@@ -2,7 +2,7 @@
 if [ "$1" = "--install" ]
 then
 		sed -i "s\Exec=run.sh\Exec=/home/${USER}/.local/bin/savedesktop\ " flatpak/io.github.vikdevelop.SaveDesktop.desktop
-		install -Dm755 native/run_natively.sh ~/.local/bin/savedesktop
+		install -Dm755 savedesktop ~/.local/bin/
 		install -D -t ~/.local/share/applications flatpak/io.github.vikdevelop.SaveDesktop.desktop
 		install -D -t ~/.local/share/metainfo flatpak/io.github.vikdevelop.SaveDesktop.metainfo.xml
 		install -D -t ~/.local/share/glib-2.0/schemas flatpak/io.github.vikdevelop.SaveDesktop.gschema.xml
@@ -18,9 +18,9 @@ then
 		install -D -t ~/.local/share/icons/hicolor/scalable/apps flatpak/icons/io.github.vikdevelop.SaveDesktop.svg
 		install -D -t ~/.local/share/icons/hicolor/symbolic/apps flatpak/icons/io.github.vikdevelop.SaveDesktop-symbolic.svg
 		install -D -t ~/.local/share/icons/hicolor/symbolic/apps flatpak/symbolic-icons/desktop-symbolic.svg
-		install -D -t ~/.local/share/icons/hicolor/symbolic/apps flatpak/symbolic-icons/edit-symbolic.svg
 		install -D -t ~/.local/share/icons/hicolor/symbolic/apps flatpak/symbolic-icons/list-view.png
   		install -D -t ~/.local/share/icons/hicolor/symbolic/apps flatpak/symbolic-icons/done.svg
+    		install -D -t ~/.local/share/icons/hicolor/symbolic/apps flatpak/preferences-system-symbolic.svg
 		# Create cache and data dirs
 		mkdir ~/.cache/io.github.vikdevelop.SaveDesktop
 		mkdir ~/.local/share/io.github.vikdevelop.SaveDesktop
@@ -41,6 +41,8 @@ if [ "$1" = "--remove" ]
 					rm ~/.local/share/icons/hicolor/symbolic/apps/desktop-symbolic.svg
 					rm ~/.local/share/icons/hicolor/symbolic/apps/edit-symbolic.svg
 					rm ~/.local/share/icons/hicolor/symbolic/apps/list-view.png
+     					rm ~/.local/share/icons/hicolor/symbolic/apps/done.svg
+	  				rm ~/.local/share/icons/hicolor/symbolic/apps/preferences-system-symbolic.svg
 					rm -rf /tmp/SaveDesktop
 					echo "SaveDesktop has been removed."
 fi

native/run_natively.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/python3
+import os, sys, shutil, zipfile, tarfile, argparse
+from pathlib import Path
+
+flatpak = os.path.exists("/.flatpak-info")
+snap = os.environ.get('SNAP_NAME', '') == 'savedesktop'
+
+# Cache directory
+cache_path = f"{Path.home()}/.var/app/io.github.vikdevelop/SaveDesktop/cache/tmp" if flatpak else f"{os.getenv('SNAP_USER_COMMON')}/.cache/tmp" if snap else f"{Path.home()}/.cache/io.github.vikdevelop.SaveDesktop"
+
+# Init dir for loading the Python scripts
+init_dir = "/app" if flatpak else f"{os.getenv('SNAP')}/usr" if snap else f"{Path.home()}/.local/share/savedesktop/src"
+sys.path.append(init_dir)
+
+# Command-line arguments
+parser = argparse.ArgumentParser()
+parser.add_argument("--background", action="store_true", help="Start periodic saving")
+parser.add_argument("--sync", action="store_true", help="Sync desktop configuration")
+parser.add_argument("--save-now", action="store_true", help="Save configuration using UI parameters")
+parser.add_argument("--import-config", help="Import configuration from a file", type=str)
+args = parser.parse_args()
+
+# Run Python scripts from the listed command-line arguments
+if args.background:
+    from periodic_saving import PeriodicBackups
+    pb = PeriodicBackups()
+    pb.run(None)
+    exit()
+elif args.sync:
+    from network_sharing import Syncing
+    exit()
+elif args.save_now:
+    from periodic_saving import PeriodicBackups
+    pb = PeriodicBackups()
+    pb.run(now=True)
+if args.import_config:
+    file_path = args.import_config
+    if not os.path.exists(file_path):
+        print(f"File not found: {file_path}")
+        exit(1)
+    
+    shutil.rmtree(os.path.join(cache_path, "import_config"), ignore_errors=True)
+    os.makedirs(os.path.join(cache_path, "import_config"), exist_ok=True)
+    os.chdir(os.path.join(cache_path, "import_config"))
+    
+    if file_path.endswith('.sd.zip'):
+        os.system(f"unzip {file_path}")
+    elif file_path.endswith('.sd.tar.gz'):
+        os.system(f"tar -xf {file_path}")
+    else:
+        print("Unsupported file type. Use *.sd.tar.gz or *.sd.zip.")
+        exit(1)
+    
+    os.system(f"python3 {init_dir}/config.py --import_")
+    exit()
+else:
+    import main_window

run.sh

@@ -2,14 +2,13 @@
 In this directory is located the most important part of the app, which is its source code.
 Because there are a lot of files, this README helps you with navigate in this directory:
 
-- `backup_flatpaks.sh` - saving Flatpak applications to a list in the configuration archive
 - `config.py` - saving and importing user configuration from and in the configuration archive
+- `flatpak_apps_dialog.py` - the dialog for setting, what user data of the Flatpak apps will be included in the configuration archive
 - `install_flatpak_from_script.py` - installing Flatpak apps from the list to the system and copying user data from the configuration archive to the ~/.var/app directory
 - `localization.py` - Based on the detected system language, the application sets the interface language (if the system language is not in the list of available languages, English is set), also sets the cache and application data folders and also the application version and release notes
 - `main_window.py` - the GUI of the app
-- `network_sharing.py` - synchronization between computers in the network within Python HTTP server
+- `network_sharing.py` - synchronization between computers in the network within Python HTTP server or cloud drive folder
 - `open_wiki.py` - opening the Github wiki of this app in the system language (if it is not available in the list of available languages, English opens)
 - `periodic_saving.py` - saving configuration periodically
-- `server.py` - starting Python HTTP server for synchronization between computers in the network
 - `shortcuts_window.py` - showing available Keyboard shortcuts in the window
 - `tty_environments.py` - detecting desktop environemnt in the TTY mode