Change a destination of the temp file

Author: vikdevelop

src/core/periodic_saving.py

@@ -3,7 +3,6 @@
 from pathlib import Path
 from gi.repository import GLib, Gio
 from savedesktop.globals import *
-from savedesktop.core.password_store import PasswordStore
 
 # Get the current date
 dt = datetime.now()
@@ -33,9 +32,10 @@ def run(self, now: bool) -> None:
         self.pbfolder = f'{settings["periodic-saving-folder"].format(download_dir)}'
 
         if now:
-            print("Saving immediately")
+            print("MODE: Save now")
             self.backup()
         else:
+            print("MODE: Periodic saving")
             self.get_interval()
 
     # Get the periodic saving interval from GSettings
@@ -58,7 +58,7 @@ def check_and_backup(self, interval):
             print(f"Backup not needed today. Last backup was on {self.last_backup_date}.")
 
     def backup(self):
-        if self.pbfolder == f'{download_dir}/SaveDesktop/archives':
+        if self.pbfolder == '{}/SaveDesktop/archives'.format(download_dir) or self.pbfolder == f'{download_dir}/SaveDesktop/archives':
             try:
                 if not os.path.exists(f"{download_dir}/SaveDesktop/archives"):
                     os.makedirs(f"{download_dir}/SaveDesktop/archives")
@@ -72,7 +72,6 @@ def backup(self):
         else:
             self.filename = settings["filename-format"]
 
-        print("MODE: Periodic saving")
         self.call_archive_command()
 
         self.save_last_backup_date()

src/core/synchronization.py

@@ -132,9 +132,9 @@ def try_passwordstore():
             app.run([])
             self.password = try_passwordstore()
 
-        # #3 If password is still unavailable, get it from the {DATA}/entered-password.txt file
-        if not self.password and os.path.exists(f"{DATA}/entered-password.txt"):
-            with open(f"{DATA}/entered-password.txt") as ep:
+        # #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:
                 self.password = ep.read().strip()
 
         # #4 Final check
@@ -159,8 +159,8 @@ def done(self):
             with open(f"{DATA}/sync-info.json", "w") as s:
                 json.dump({"last-synced": date.today().isoformat()}, s)
 
-        if os.path.exists(f"{DATA}/entered-password.txt"):
-            os.remove(f"{DATA}/entered-password.txt")
+        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/password_checker.py

@@ -77,7 +77,7 @@ def save_password(self, w):
         if self.remSwitch.get_active():
             PasswordStore(self.passEntry.get_text())
         else:
-            with open(f"{DATA}/entered-password.txt", "w") as ep:
+            with open(f"{CACHE}/temp_file", "w") as ep:
                 ep.write(self.passEntry.get_text())
         self.close()