Update (configs, etc.) now handled by auto update module

Author: MaxBQb

app_start.py

@@ -17,6 +17,7 @@ class AppStartManager:
     updater = inject.attr(AutoUpdater)
     state_controller = inject.attr(FilterStateController)
     interaction_manager = inject.attr(InteractionManager)
+    config_file_manager = inject.attr(ConfigFileManager)
     config = inject.attr(ConfigObj)
     inversion_rules_file_manager = inject.attr(RulesFileManager)
     main_executor = inject.attr(MainExecutor)
@@ -25,7 +26,8 @@ class AppStartManager:
 
     def setup(self):
         self.close_manager.setup()
-        self.updater.on_update_applied = self.handle_update
+        self.config_file_manager.setup()
+        self.inversion_rules_file_manager.setup()
         self.interaction_manager.setup()
         self.tray.setup()
 
@@ -55,40 +57,12 @@ async def run(self):
             pass
         print("Bye")
 
-    def handle_update(self,
-                      new_path: Path,
-                      current_path: Path,
-                      backup_filename: str):
-        try:
-            from shutil import copyfile
-            from os import path
-
-            copy_list = [
-                self.config.filename,
-                self.inversion_rules_file_manager.filename
-            ]
-
-            for filename in copy_list:
-                current_file_path = path.join(current_path, filename)
-                new_file_path = path.join(new_path, filename)
-                if path.exists(current_file_path):
-                    if not path.exists(new_file_path):
-                        copyfile(current_file_path, new_file_path)
-                    else:
-                        print(f"Skip {filename}: update contains same file")
-                else:
-                    print(f"Skip {filename}: no such file")
-
-        except Exception as e:
-            print("Failed to copy previous version data:", e)
-            print("You may do this manually, from", backup_filename)
-            print("Files to copy:", copy_list)
-
 
 def configure(binder: inject.Binder):
     # Couple of components
     # Handled at runtime
     config_manager = ConfigFileManager("config")
+    binder.bind(ConfigFileManager, config_manager)
     binder.bind(ConfigObj, config_manager.config)
 
     inversion_rules = InversionRulesController()

auto_update.py

@@ -38,28 +38,60 @@ def __init__(self):
         from datetime import timedelta
         self.delay = timedelta(days=1).total_seconds()
         self.response = Queue()
+        # carry-on baggage is list of filenames
+        # moved to new location on update
+        self.carryon: list[str] = []
         self.developer_mode = sys.argv[0].endswith(".py")
         if not self.developer_mode:
             self.thread = Thread(
                 name="Update Checker",
-                target=self.check_loop,
+                target=self._run_check_loop,
                 daemon=True
             )
         self.update_in_progress = False
 
+    def move_on_update(self, filename):
+        self.carryon.append(filename)
+
+    def _move_carryon(self,
+                      current_path: Path,
+                      new_path: Path):
+        if not self.carryon:
+            return
+
+        from shutil import copyfile
+        from os import path
+
+        for filename in self.carryon:
+            current_file_path = path.join(current_path, filename)
+            new_file_path = path.join(new_path, filename)
+            if path.exists(current_file_path):
+                if not path.exists(new_file_path):
+                    copyfile(current_file_path, new_file_path)
+                else:
+                    print(f"Skip {filename}: update contains same file")
+            else:
+                print(f"Skip {filename}: no such file")
+
     def on_update_applied(self,
                           new_path: Path,
                           current_path: Path,
                           backup_filename: str):
-        pass
+        try:
+            self._move_carryon(current_path, new_path)
+        except Exception as e:
+            print("Failed to copy previous version data:", e)
+            print("You may do this manually, from", backup_filename)
+            print("Files to copy:", self.carryon)
+            input("Press enter to continue update")
 
     def run_check_loop(self):
         if self.developer_mode:
             return
         self.thread.start()
         return self.thread
 
-    def check_loop(self):
+    def _run_check_loop(self):
         while True:
             if self.config["update"]["check_for_updates"]:
                 self.check_for_updates()

realtime_data_sync.py

@@ -1,18 +1,25 @@
+import inject
 import jsons
 import yaml
 from configobj import ConfigObj
 from file_tracker import FileTracker
 from inversion_rules import InversionRulesController, InversionRule, RULES
+from auto_update import AutoUpdater
 
 
 class ConfigFileManager(FileTracker):
+    updater = inject.attr(AutoUpdater)
+
     def __init__(self, name: str):
         self.config = ConfigObj(infile=name + ".ini",
                                 configspec=name + "_description.ini",
                                 create_empty=True,
                                 write_empty_values=True)
         super().__init__(self.config.filename)
 
+    def setup(self):
+        self.updater.move_on_update(self.filename)
+
     def load_file(self):
         self.validate_config()
 
@@ -60,12 +67,17 @@ def on_partially_invalid(self, validation_response: dict):
 
 
 class RulesFileManager(FileTracker):
+    updater = inject.attr(AutoUpdater)
+
     def __init__(self, name: str, rules_controller: InversionRulesController):
         self.rules: RULES = None
         self.rules_controller = rules_controller
         self.rules_controller.on_modified = self.save_rules
         super().__init__(name + "_rules.yaml")
 
+    def setup(self):
+        self.updater.move_on_update(self.filename)
+
     def load_file(self):
         try:
             with self.observer.overlook():