Release v3.2

vikdevelop · web-flow · commit e314591be9aa · 2024-03-22T10:55:51.000+01:00
Release date: March 24, 2024
diff --git a/README.md b/README.md
@@ -159,5 +159,5 @@ You can send an issue on GitHub, or if you are not registered on GitHub, you can
 - Build with Flatpak builder (beta version) ⚠️**UNSTABLE**⚠️
   ```
   git clone https://github.com/vikdevelop/SaveDesktop && cd SaveDesktop && flatpak-builder build *.yaml --install --user
-  # Maybe you will need to install org.gnome.Sdk (version 44) with flatpak
+  # Maybe you will need to install org.gnome.Sdk (latest version) with flatpak
   ```
diff --git a/flatpak/io.github.vikdevelop.SaveDesktop.gschema.xml b/flatpak/io.github.vikdevelop.SaveDesktop.gschema.xml
@@ -86,5 +86,9 @@
 		  <default>false</default>
 		  <summary>Manually sync</summary>
 		</key>
+		<key name="disabled-flatpak-apps-data" type="as">
+		  <default>[]</default>
+		  <summary>Select, what Flatpak applications data will be saved</summary>
+		</key>
 	</schema>
 </schemalist>
diff --git a/flatpak/io.github.vikdevelop.SaveDesktop.metainfo.xml b/flatpak/io.github.vikdevelop.SaveDesktop.metainfo.xml
@@ -73,6 +73,15 @@
     </branding>
           
     <releases>
+       <release version="3.2" date="2024-03-24">
+           <description>
+               <ul>
+                  <li>Added option for selecting what Flatpak applications data will be included in the configuration archive; just click on the button next to the User data of installed Flatpak apps switch</li>
+                  <li>Improved displaying status about saving and importing configuration</li>
+                  <li>From now on, periodic saving will take place only after the first login on a given day, not after further logins on the same day</li>
+                </ul>
+           </description>
+       </release>
        <release version="3.1" date="2024-02-02">
            <description>
                <ul>
diff --git a/flatpak/symbolic-icons/done.svg b/flatpak/symbolic-icons/done.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><circle cx="32" cy="32" fill="#4bd37b" r="30"/><path d="m46 14-21 21.6-7-7.2-7 7.2 14 14.4 28-28.8z" fill="#fff"/></svg>
diff --git a/io.github.vikdevelop.SaveDesktop.yaml b/io.github.vikdevelop.SaveDesktop.yaml
@@ -69,6 +69,7 @@ modules:
        - install -D -t /app/share/icons/hicolor/128x128/apps flatpak/symbolic-icons/exclamation_mark.png
        - install -D -t /app/share/icons/hicolor/128x128/apps flatpak/symbolic-icons/desktop-symbolic.svg
        - install -D -t /app/share/icons/hicolor/128x128/apps flatpak/symbolic-icons/list-view.png
+       - install -D -t /app/share/icons/hicolor/128x128/apps flatpak/symbolic-icons/done.svg
        - install -D -t /app/share/metainfo flatpak/io.github.vikdevelop.SaveDesktop.metainfo.xml
        - install -D -t /app/share/glib-2.0/schemas flatpak/io.github.vikdevelop.SaveDesktop.gschema.xml
        - glib-compile-schemas /app/share/glib-2.0/schemas
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -75,6 +75,7 @@ parts:
       install -D -t $CRAFT_PART_INSTALL/usr/share/icons/hicolor/128x128/apps $CRAFT_PART_SRC/flatpak/symbolic-icons/exclamation_mark.png
       install -D -t $CRAFT_PART_INSTALL/usr/share/icons/hicolor/128x128/apps $CRAFT_PART_SRC/flatpak/symbolic-icons/desktop-symbolic.svg
       install -D -t $CRAFT_PART_INSTALL/usr/share/icons/hicolor/128x128/apps $CRAFT_PART_SRC/flatpak/symbolic-icons/list-view.png
+      install -D -t $CRAFT_PART_INSTALL/usr/share/icons/hicolor/128x128/apps $CRAFT_PART_SRC/flatpak/symbolic-icons/done.svg
       install -D -t $CRAFT_PART_INSTALL/usr/share/metainfo $CRAFT_PART_SRC/flatpak/io.github.vikdevelop.SaveDesktop.metainfo.xml
       install -D -t $CRAFT_PART_INSTALL/usr/share/glib-2.0/schemas $CRAFT_PART_SRC/flatpak/io.github.vikdevelop.SaveDesktop.gschema.xml
       glib-compile-schemas $CRAFT_PART_INSTALL/usr/share/glib-2.0/schemas
diff --git a/src/config.py b/src/config.py
@@ -4,6 +4,7 @@
 from gi.repository import GLib, Gio
 from localization import _, CACHE, DATA, home, system_dir, flatpak, snap
 import argparse
+import shutil
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-s", "--save", help="Save the current configuration", action="store_true")
@@ -36,37 +37,81 @@
 settings = Gio.Settings.new_with_path("io.github.vikdevelop.SaveDesktop", "/io/github/vikdevelop/SaveDesktop/")
 cache_replacing = f'{CACHE}'
 config = cache_replacing.replace("cache/tmp", "config/glib-2.0/settings")
+flatpak_app_data = settings["disabled-flatpak-apps-data"]
 
 class Save:
     def __init__(self):
+        print("saving settings from the Dconf database")
         os.system("dconf dump / > ./dconf-settings.ini")
-        #os.system('cp -R {home}/.config/dconf/user ./')
+        print("saving Gtk settings")
         os.system(f'cp -R {home}/.config/gtk-4.0 ./')
         os.system(f'cp -R {home}/.config/gtk-3.0 ./')
         if settings["save-backgrounds"] == True:
+            print("saving backgrounds")
             os.system(f'cp -R {home}/.local/share/backgrounds ./')
         if settings["save-icons"] == True:
+            print("saving icons")
             os.system(f'cp -R {home}/.local/share/icons ./')
             os.system(f'cp -R {home}/.icons ./')
         if settings["save-themes"] == True:
+            print("saving themes")
             os.system(f'cp -R {home}/.themes ./')
         if settings["save-fonts"] == True:
+            print("saving fonts")
             os.system(f'cp -R {home}/.fonts ./')
         if settings["save-desktop-folder"] == True:
+            print("saving desktop folder")
             if " " in GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP):
                 desktop_with_spaces = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP)
                 desktop_without_spaces = desktop_with_spaces.replace(" ", "*")
             else:
                 desktop_without_spaces = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP)
             os.system(f'cp -R {desktop_without_spaces} ./Desktop/ ')
         if settings["save-installed-flatpaks"] == True:
+            print("saving list of installed Flatpak apps")
             os.system('sh /app/backup_flatpaks.sh')
         if settings["save-flatpak-data"] == True:
+            print("saving user data of installed Flatpak apps")
+            blst = settings["disabled-flatpak-apps-data"]
+            # convert GSettings property to list
+            blist = blst
+            # add io.github.vikdevelop.SaveDesktop to blacklist, because during saving configuration the cache folder is too large
+            blist += ["io.github.vikdevelop.SaveDesktop"]
+            blacklist = blist
+            
+            # set destination dir
             if os.path.exists(f"{CACHE}/save_config"):
-                os.system(f'cd {home}/.var/app && mkdir {CACHE}/save_config/app && cp -r `ls -A | grep -v "io.github.vikdevelop.SaveDesktop"` {CACHE}/save_config/app/')
+                os.makedirs(f"{CACHE}/save_config/app", exist_ok=True)
+                destdir = f"{CACHE}/save_config/app"
             elif os.path.exists(f"{CACHE}/periodic_saving"):
-                os.system(f'cd {home}/.var/app && mkdir {CACHE}/periodic_saving/app && cp -r `ls -A | grep -v "io.github.vikdevelop.SaveDesktop"` {CACHE}/periodic_saving/app/')
+                os.makedirs(f"{CACHE}/periodic_saving/app", exist_ok=True)
+                destdir = f"{CACHE}/periodic_saving/app"
+            
+            # copy Flatpak apps data
+            for item in os.listdir(f"{home}/.var/app"):
+                if item not in blacklist:
+                    source_path = os.path.join(f"{home}/.var/app", item)
+                    destination_path = os.path.join(destdir, item)
+                    if os.path.isdir(source_path):
+                        try:
+                            shutil.copytree(source_path, destination_path)
+                        except Exception as e:
+                            print(f"Error copying directory {source_path}: {e}")
+                    else:
+                        try:
+                            shutil.copy2(source_path, destination_path)
+                        except Exception as e:
+                            print(f"Error copying file {source_path}: {e}")
+
+            # save user data except for the cache of the SaveDesktop app if the app is not in the "disabled-flatpak-apps-data" key of the GSettings database
+            if not "io.github.vikdevelop.SaveDesktop" in flatpak_app_data:
+                os.makedirs(f"{destdir}/io.github.vikdevelop.SaveDesktop", exist_ok=True)
+                os.chdir(f"{home}/.var/app/io.github.vikdevelop.SaveDesktop")
+                os.system(f"cp -R ./config {destdir}/io.github.vikdevelop.SaveDesktop/")
+                os.system(f"cp -R ./data {destdir}/io.github.vikdevelop.SaveDesktop/")
+                os.chdir(f"{CACHE}/save_config")
             
+        print("saving desktop environment configuration files")
         # Save configs on individual desktop environments
         if environment == 'GNOME':
             os.system(f"cp -R {home}/.local/share/gnome-background-properties ./")
@@ -115,6 +160,7 @@ def __init__(self):
                 os.system(f"cp -R {home}/.local/share/wallpapers ./xdg-data/")
             if settings["save-extensions"] == True:
                 os.system(f"cp -R {home}/.local/share/plasma ./xdg-data/")
+        print("creating configuration archive")
         os.system(f"tar --exclude='cfg.sd.tar.gz' --gzip -cf cfg.sd.tar.gz ./")
         if os.path.exists(f"{CACHE}/.filedialog.json"):
             with open(f"{CACHE}/.filedialog.json") as j:
@@ -125,7 +171,11 @@ def __init__(self):
             if not settings["periodic-import"] == "Never2":
                 file = os.path.basename(j["recent_file"])
                 os.system(f"cp -R ./cfg.sd.tar.gz {DATA}/synchronization/{file}")
+        print("moving the configuration archive to the user-defined directory")
         os.system(f"mv ./cfg.sd.tar.gz {j['recent_file']}")
+        if os.path.exists(f"{CACHE}/save_config"):
+            os.system("echo > done_gui")
+            print("THE CONFIGURATION HAS BEEN SAVED SUCCESSFULLY!")
         
 class Import:
     def __init__(self):
@@ -135,6 +185,7 @@ def __init__(self):
             os.system("tar -xf %s ./" % j["import_file"])
         if not os.path.exists("{}/.config".format(home)):
             os.system(f"mkdir {home}/.config/")
+        print("importing settings from the Dconf database")
         if os.path.exists("user"):
             os.system(f"cp -R ./user {home}/.config/dconf/")
         else:
@@ -143,22 +194,30 @@ def __init__(self):
             else:
                 os.system("echo user-db:user > temporary-profile")
                 os.system('DCONF_PROFILE="$(pwd)/temporary-profile" dconf load / < dconf-settings.ini')
+        print("importing list of installed Flatpak apps (them will be installed after the next login)")
         os.system(f'cp ./installed_flatpaks.sh {DATA}/')
         os.system(f'cp ./installed_user_flatpaks.sh {DATA}/')
+        print("importing icons")
         os.system(f'cp -R ./icons {home}/.local/share/')
-        os.system(f'cp -R ./.themes {home}/')
         os.system(f'cp -R ./.icons {home}/')
+        print("importing themes")
+        os.system(f'cp -R ./.themes {home}/')
+        print("importing backgrounds")
         os.system(f'cp -R ./backgrounds {home}/.local/share/')
+        print("importing fonts")
         os.system(f'cp -R ./.fonts {home}/')
+        print("importing Gtk settings")
         os.system(f'cp -R ./gtk-4.0 {home}/.config/')
         os.system(f'cp -R ./gtk-3.0 {home}/.config/')
+        print("importing desktop directory")
         os.system(f'cp -R ./Desktop/* {GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP)}/')
         if os.path.exists(f'{CACHE}/import_config/app'):
             with open(f"copying_flatpak_data", "w") as c:
                 c.write("copying flatpak data ...")
         elif os.path.exists(f'{CACHE}/syncing/app'):
             with open(f"copying_flatpak_data", "w") as c:
                 c.write("copying flatpak data ...")
+        print("importing desktop environment configuration files")
         # Apply configs for individual desktop environments
         if environment == 'GNOME':
             os.system(f'cp -R ./gnome-background-properties {home}/.local/share/')
@@ -199,9 +258,10 @@ def __init__(self):
                 os.chdir("%s/import_config" % CACHE)
             os.chdir('xdg-data')
             os.system(f'cp -R ./ {home}/.local/share/')
-        if not snap:
+        if flatpak:
             self.create_flatpak_desktop()
         os.system(f"echo > {CACHE}/import_config/done")
+        print("THE CONFIGURATION HAS BEEN IMPORTED SUCCESSFULLY!")
             
     # Create desktop file for install Flatpaks from list
     def create_flatpak_desktop(self):
diff --git a/src/localization.py b/src/localization.py
@@ -24,9 +24,13 @@
 s.close()
 
 # Set application version, and icon
-v = "3.1.2"
+v = "3.2"
 icon = "io.github.vikdevelop.SaveDesktop"
-rel_notes = "<p>Edited application data for passing the Flathub guidelines</p>"
+rel_notes = "<ul>\
+<li>Added option for selecting what Flatpak applications data will be included in the configuration archive; just click on the button next to the \"User data of installed Flatpak apps\" switch</li>\
+<li>Improved displaying status about saving and importing configuration</li>\
+<li>From now on, periodic saving will take place only after the first login on a given day, not after further logins on the same day</li>\
+</ul>"
 
 flatpak = os.path.exists("/.flatpak-info")
 snap = os.environ.get('SNAP_NAME', '') == 'savedesktop'
diff --git a/src/main_window.py b/src/main_window.py
diff --git a/src/periodic_saving.py b/src/periodic_saving.py
diff --git a/translations/en.json b/translations/en.json
