Final changes before release

Author: vikdevelop

data/io.github.vikdevelop.SaveDesktop.metainfo.xml.in

@@ -66,7 +66,8 @@
                     <li>Refactored code base</li>
                     <li>Snap support has been discontinued due to technical compatibility issues. Snap users can continue using v3.6.2-hotfix, but updates will only be provided for Flatpak or other methods.</li>
                     <li>Removed the "Use Syncthing folder instead" from the Initial Synchronization setup dialog for GNOME-based environments</li>
-                    <li>Other minor UI improvements</li>
+                    <li>Removed the "Manually" option for periodic synchronization due to complications with encrypted archives</li>
+                    <li>Improved support for small screens</li>
                 </ul>
            </description>
        </release>

po/savedesktop.pot

@@ -112,10 +112,6 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: src/gui/more_options_dialog.py
-msgid "Manually"
-msgstr ""
-
 #: src/gui/more_options_dialog.py
 msgid "Learn more"
 msgstr ""
@@ -415,11 +411,6 @@ msgstr ""
 msgid "From now on, you can sync the config from the menu in the header bar"
 msgstr ""
 
-#: src/gui/templates/shortcuts_window.ui:50
-#: src/gui/window.py
-msgid "Synchronise manually"
-msgstr ""
-
 #: src/gui/templates/shortcuts_window.ui:36
 #: src/gui/window.py
 msgid "Keyboard shortcuts"

src/core/archive.py

@@ -21,7 +21,7 @@ def cleanup_cache_dir():
 
 # Get password entered in the "Create a new password" dialog from the temporary file
 def get_password():
-    temp_file = f"{CACHE}/temp_file"
+    temp_file = f"{TEMP_CACHE}/temp_file"
     if os.path.exists(temp_file):
         with open(temp_file) as tmp:
             return tmp.read().strip()
@@ -31,8 +31,8 @@ def get_password():
 
 # Remove above temporary file
 def remove_temp_file():
-    if os.path.exists(f"{CACHE}/temp_file"):
-        os.remove(f"{CACHE}/temp_file")
+    if os.path.exists(f"{TEMP_CACHE}/temp_file"):
+        os.remove(f"{TEMP_CACHE}/temp_file")
 
 class Create:
     def __init__(self):

src/core/flatpaks_installer.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
-import os
+import os, subprocess, sys
 from pathlib import Path
-import subprocess
 
 CACHE_FLATPAK = f"{Path.home()}/.var/app/io.github.vikdevelop.SaveDesktop/cache/tmp"
 
@@ -67,3 +66,6 @@
 autostart_file = f"{Path.home()}/.config/autostart/io.github.vikdevelop.SaveDesktop.Flatpak.desktop"
 if os.path.exists(autostart_file):
     os.remove(autostart_file)
+
+# Remove this script after finishing the operations
+os.remove(sys.argv[0])

src/core/synchronization.py

@@ -13,7 +13,6 @@ class Syncing:
     def __init__(self):
         self.last_sync_date = self.load_last_sync_date()
         if not settings["file-for-syncing"]:
-            settings["manually-sync"] = False
             print("Synchronization is not set up.")
         else:
             self.get_sync_interval()
@@ -34,34 +33,21 @@ def get_sync_interval(self):
             "Daily2": 1,
             "Weekly2": 7,
             "Monthly2": 30,
-            "Manually2": None
         }
         interval = intervals.get(settings["periodic-import"], None)
         if interval is None:
-            settings["manually-sync"] = settings["periodic-import"] == "Manually2"
-            if settings["manually-sync"]:
-                self.check_manually_sync_status()
-            else:
-                print("Synchronization is not set up.")
+            print("Synchronization is not set up. Maybe you have selected the Never interval?")
         else:
-            settings["manually-sync"] = False
             self.check_and_sync(interval)
 
     # Check, if the synchronization is necessary for that day
     def check_and_sync(self, interval):
         today = date.today()
         if (today - self.last_sync_date).days >= interval:
-            self.check_manually_sync_status()
+            self.download_config()
         else:
             print(f"Sync not needed today. Last sync was on {self.last_sync_date}.")
 
-    # Check, if "Manually" is the sync interval
-    def check_manually_sync_status(self):
-        if settings["periodic-import"] == "Manually2" and not os.path.exists(f"{CACHE}/.from_app"):
-            print("Please sync from the Save Desktop app")
-        else:
-            self.download_config()
-    
     # Download the configuration archive from the cloud drive folder
     def download_config(self):
         print("MODE: Synchronization")
@@ -133,8 +119,8 @@ def try_passwordstore():
             self.password = try_passwordstore()
 
         # #3 If password is still unavailable, get it from the {CACHE}/entered-password.txt file
-        if not self.password and os.path.exists(f"{CACHE}/temp_file"):
-            with open(f"{CACHE}/temp_file") as ep:
+        if not self.password and os.path.exists(f"{CACHE}/workspace/temp_file"):
+            with open(f"{CACHE}/workspace/temp_file") as ep:
                 self.password = ep.read().strip()
 
         # #4 Final check
@@ -151,13 +137,12 @@ def call_archive_command(self):
         self.archive_mode = "--unpack"
         self.archive_name = f"{settings['file-for-syncing']}/{self.file}.sd.zip"
 
-        subprocess.run([sys.executable, "-m", "savedesktop.core.archive", self.archive_mode, self.archive_name], env={**os.environ, "PYTHONPATH": f"{app_prefix}"})
+        subprocess.run([sys.executable, "-m", "savedesktop.core.archive", self.archive_mode, self.archive_name], env={**os.environ, "PYTHONPATH": f"{app_prefix}"}, check=True)
         self.done()
 
     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)
+        with open(f"{DATA}/sync-info.json", "w") as s:
+            json.dump({"last-synced": date.today().isoformat()}, s)
 
         # 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/synchronization_dialogs.py

@@ -368,7 +368,7 @@ def __init__(self, parent):
 
         # Periodic sync section
         options = Gtk.StringList.new(strings=[
-           _("Never"), _("Manually"), _("Daily"), _("Weekly"), _("Monthly")
+           _("Never"), _("Daily"), _("Weekly"), _("Monthly")
         ])
 
         self.psyncRow = Adw.ComboRow.new()
@@ -377,15 +377,13 @@ def __init__(self, parent):
         self.psyncRow.set_title(_("Periodic synchronization"))
         self.psyncRow.set_title_lines(2)
         self.psyncRow.set_model(model=options)
-        self.psyncRow.connect('notify::selected-item', self.on_psync_changed)
+        self.psyncRow.connect('notify::selected-item', self._on_psync_changed)
         self.cloudBox.append(self.psyncRow)
 
         # Load periodic sync values form GSettings database
         old_psync = settings["periodic-import"]
         if settings["periodic-import"] == "Never2":
             self.psyncRow.set_selected(0)
-        elif settings["periodic-import"] == "Manually2":
-            self.psyncRow.set_selected(1)
         elif settings["periodic-import"] == "Daily2":
             self.psyncRow.set_selected(2)
         elif settings["periodic-import"] == "Weekly2":
@@ -436,26 +434,25 @@ def reset_cloud_folder(self, w):
             [os.remove(path) for path in [f"{home}/.config/autostart/io.github.vikdevelop.SaveDesktop.sync.desktop", f"{DATA}/savedesktop-synchronization.sh"] if os.path.exists(path)]
 
     # enable or disable the response of this dialog in depending on the selected periodic synchronization interval
-    def on_psync_changed(self, psyncRow, GParamObject):
-        if not self.psyncRow.get_selected_item().get_string() == _("Never") and not self.cfileRow.get_subtitle():
-            self.set_response_enabled('ok', True)
+    def _on_psync_changed(self, psyncRow, GParamObject):
+        if not self.psyncRow.get_selected_item().get_string() == _("Never"):
+            if not self.cfileRow.get_subtitle() == "":
+                self.set_response_enabled('ok', True)
+        else:
+            self.set_response_enabled('ok', False)
 
     # Action after closing URL dialog
     def cloudDialog_closed(self, w, response):
         if response == 'ok':
             self.check_psync = settings["periodic-import"]
             # translate the periodic sync options to English
             selected_item = self.psyncRow.get_selected_item()
-            sync = {_("Never"): "Never2", _("Manually"): "Manually2", _("Daily"): "Daily2", _("Weekly"): "Weekly2", _("Monthly"): "Monthly2"}
+            sync = {_("Never"): "Never2", _("Daily"): "Daily2", _("Weekly"): "Weekly2", _("Monthly"): "Monthly2"}
 
             sync_item = sync.get(selected_item.get_string(), "Never2")
 
             settings["periodic-import"] = sync_item
 
-            # if the selected periodic saving interval is "Manually2", it enables the manually-sync value
-            if settings["periodic-import"] == "Manually2":
-                settings["manually-sync"] = True
-
             # save the status of the Bidirectional Synchronization switch
             settings["bidirectional-sync"] = self.bsSwitch.get_active()
 
@@ -479,25 +476,15 @@ def _call_automount(self):
             else:
                 raise AttributeError(_("You didn't select the cloud drive folder!"))
         except Exception as e:
-            os.system(f'notify-send \'{_("An error occurred")}\' \'{e}\'')
+            err_title = _("An error occurred")
+            err_desc = str(e)
+            subprocess.run(['notify-send', err_title, err_desc])
             return
         else:
             GLib.idle_add(self.__post_setup)
 
     # check if the selected periodic sync interval was Never: if yes, shows the message about the necessity to log out of the system
     def __post_setup(self):
         if self.check_psync == "Never2":
-            if not settings["periodic-import"] == "Never2" and not settings["periodic-import"] == "Manually2":
+            if not settings["periodic-import"] == "Never2":
                 self.parent.show_warn_toast()
-
-        # if it is selected to manually sync, it creates an option in the app menu in the header bar
-        if settings["manually-sync"]:
-            self.sync_menu = Gio.Menu()
-            self.sync_menu.append(_("Synchronise manually"), 'app.m-sync-with-key')
-            self.parent.main_menu.prepend_section(None, self.sync_menu)
-            self.parent.show_special_toast()
-        else:
-            try:
-                self.parent.sync_menu.remove_all()
-            except:
-                pass

src/gui/templates/shortcuts_window.ui

@@ -45,13 +45,6 @@
                 <property name="accelerator">&lt;primary&gt;q</property>
               </object>
             </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Synchronise manually</property>
-                <property name="action-name">app.m_sync_with_key</property>
-                <property name="accelerator">&lt;primary&gt;&lt;shift&gt;s</property>
-              </object>
-            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">More options</property>

src/gui/window.py

@@ -48,12 +48,6 @@ def __init__(self, *args, **kwargs):
         self.menu_button.set_primary(True)
         self.headerbar.pack_end(child=self.menu_button)
 
-        # add Manually sync section
-        if settings["manually-sync"] == True:
-            self.sync_menu = Gio.Menu()
-            self.sync_menu.append(_("Synchronise manually"), 'app.m-sync-with-key')
-            self.main_menu.prepend_section(None, self.sync_menu)
-
         # primary layout
         self.headapp = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
         self.headapp.set_valign(Gtk.Align.CENTER)
@@ -466,7 +460,7 @@ def create_password_dialog(self):
     # Action after closing pswdDialog
     def _pswdDialog_closed(self, w, response):
         if response == 'ok':
-            with open(f"{CACHE}/temp_file", "w") as tmp:
+            with open(f"{CACHE}/workspace/temp_file", "w") as tmp:
                 tmp.write(self.pswdEntry.get_text())
             self.save_config()
 
@@ -523,13 +517,14 @@ def check_password_dialog(self):
     def _checkDialog_closed(self, w, response):
         if response == 'ok':
             self.checkDialog.set_response_enabled("ok", False)
-            with open(f"{CACHE}/temp_file", "w") as tmp:
+            with open(f"{CACHE}/workspace/temp_file", "w") as tmp:
                 tmp.write(self.checkEntry.get_text())
 
             self.import_config()
 
     # Save configuration
     def save_config(self):
+        print("Saving the configuration is in progress…\nFull output will be available after finishing this operation.")
         self.archive_mode = "--create"
         self.archive_name = f"{self.folder}/{self.filename_text}"
         self.status_title = _("<big><b>Saving configuration …</b></big>\nThe configuration of your desktop environment will be saved in:\n <i>{}/{}.sd.tar.gz</i>\n").split('</b>')[0].split('<b>')[-1]
@@ -549,6 +544,7 @@ def _set_status_desc_save(self):
 
     # Import configuration
     def import_config(self):
+        print("Importing the configuration is in progress…\nFull output will be available after finishing this operation.")
         self._identify_file_type()
 
         self.archive_mode = "--unpack"
@@ -758,7 +754,7 @@ def on_close(self, w):
             os.remove(f"{CACHE}/expand_pb_row")
 
         # Remove this folder to cleanup unnecessary content created during saving,
-        # importing, or syncing the configuration only if the autostart file for
+        # importing, or syncing the configuration only if the Python script for
         # installing Flatpaks is not present
-        if not os.path.exists(f"{home}/.config/autostart/io.github.vikdevelop.SaveDesktop.Flatpak.desktop"):
+        if not os.path.exists(f"{CACHE}/workspace/flatpaks_installer.py"):
             subprocess.Popen(["rm", "-rf", f"{CACHE}/workspace"])

src/main.py

@@ -17,7 +17,6 @@ class SaveDesktopApp(Adw.Application):
     def __init__(self, **kwargs):
         super().__init__(**kwargs, flags=Gio.ApplicationFlags.FLAGS_NONE,
                          application_id="io.github.vikdevelop.SaveDesktop")
-        self.create_action('m-sync-with-key', self.sync_pc, ["<primary><shift>s"] if settings["manually-sync"] else None)
         self.create_action('save-config', self.call_saving_config, ["<primary>s"])
         self.create_action('import-config', self.call_importing_config, ["<primary>o"])
         self.create_action('ms-dialog', self.call_ms_dialog, ["<primary><shift>m"])
@@ -32,26 +31,6 @@ def __init__(self, **kwargs):
         self.create_action('about', self.on_about_action)
         self.connect('activate', self.on_activate)
 
-    # Synchronize configuation manually after clicking on the "Synchronise manually" button in the header bar menu
-    def sync_pc(self, action, param):
-        self.win.import_file = settings["file-for-syncing"]
-        self.win.please_wait_import()
-        sync_thread = Thread(target=self._sync_process)
-        sync_thread.start()
-
-    def _sync_process(self):
-        try:
-            os.system(f'notify-send "{_("Please wait …")}"')
-            os.system(f"echo > {CACHE}/.from_app")
-            subprocess.run([sys.executable, "-m", "savedesktop.core.synchronization"], check=True, env={**os.environ, "PYTHONPATH": f"{app_prefix}"})
-        except subprocess.CalledProcessError as e:
-            GLib.idle_add(self.win.show_err_msg, e)
-            self.toolbarview.set_content(self.headapp)
-            self.headerbar.set_title_widget(self.switcher_title)
-            self.switcher_bar.set_reveal(self.switcher_title.get_title_visible())
-        finally:
-            GLib.idle_add(self.win.applying_done())
-
     # Start saving the configuration using Ctrl+S keyboard shortcut
     def call_saving_config(self, action, param):
         self.win.select_folder(w="")