feat: implement cleanup function for multiproxy instances directory

set default WATCHTOWER_NO_STARTUP_MESSAGE=false

Author: MRColorR

template/user-config.json

@@ -162,7 +162,7 @@
           "WATCHTOWER_SCOPE=${M4B_WATCHTOWER_SCOPE}",
           "WATCHTOWER_POLL_INTERVAL=14400",
           "WATCHTOWER_ROLLING_RESTART=true",
-          "WATCHTOWER_NO_STARTUP_MESSAGE=true",
+          "WATCHTOWER_NO_STARTUP_MESSAGE=false",
           "WATCHTOWER_CLEANUP=true",
           "WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_NOTIFICATION_URL}"
         ],
@@ -185,7 +185,7 @@
           "WATCHTOWER_SCOPE=${M4B_WATCHTOWER_SCOPE}",
           "WATCHTOWER_POLL_INTERVAL=14400",
           "WATCHTOWER_ROLLING_RESTART=false",
-          "WATCHTOWER_NO_STARTUP_MESSAGE=true",
+          "WATCHTOWER_NO_STARTUP_MESSAGE=false",
           "WATCHTOWER_CLEANUP=true",
           "WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_NOTIFICATION_URL}"
         ],

tests/test_fn_setupApps.py

@@ -0,0 +1,67 @@
+import os
+import tempfile
+import unittest
+
+from utils.fn_setupApps import cleanup_multiproxy_instances_dir
+
+
+class TestCleanupMultiproxyInstancesDir(unittest.TestCase):
+    def test_missing_instances_dir_is_noop(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            instances_dir = os.path.join(tmp_dir, "m4b_proxy_instances")
+            backup_root = os.path.join(tmp_dir, "m4b_proxy_instances_backup")
+
+            cleanup_multiproxy_instances_dir(instances_dir, backup_root)
+
+            self.assertFalse(os.path.exists(instances_dir))
+            self.assertFalse(os.path.exists(backup_root))
+
+    def test_empty_instances_dir_is_removed(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            instances_dir = os.path.join(tmp_dir, "m4b_proxy_instances")
+            backup_root = os.path.join(tmp_dir, "m4b_proxy_instances_backup")
+            os.makedirs(instances_dir, exist_ok=True)
+
+            cleanup_multiproxy_instances_dir(instances_dir, backup_root)
+
+            self.assertFalse(os.path.exists(instances_dir))
+            self.assertFalse(os.path.exists(backup_root))
+
+    def test_non_empty_instances_dir_is_moved_to_backup(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            instances_dir = os.path.join(tmp_dir, "m4b_proxy_instances")
+            backup_root = os.path.join(tmp_dir, "m4b_proxy_instances_backup")
+            os.makedirs(instances_dir, exist_ok=True)
+
+            instance_subdir = os.path.join(instances_dir, "money4band_1234")
+            os.makedirs(instance_subdir, exist_ok=True)
+            marker_file = os.path.join(instance_subdir, "docker-compose.yaml")
+            with open(marker_file, "w") as f:
+                f.write("services: {}")
+
+            cleanup_multiproxy_instances_dir(instances_dir, backup_root)
+
+            self.assertFalse(os.path.exists(instances_dir))
+            self.assertTrue(os.path.isdir(backup_root))
+
+            backup_instances_root = os.path.join(backup_root, "m4b_proxy_instances")
+            self.assertTrue(os.path.isdir(backup_instances_root))
+
+            backups = [
+                entry
+                for entry in os.listdir(backup_instances_root)
+                if os.path.isdir(os.path.join(backup_instances_root, entry))
+            ]
+            self.assertEqual(len(backups), 1)
+
+            moved_file = os.path.join(
+                backup_instances_root,
+                backups[0],
+                "money4band_1234",
+                "docker-compose.yaml",
+            )
+            self.assertTrue(os.path.isfile(moved_file))
+
+
+if __name__ == "__main__":
+    unittest.main()

utils/fn_setupApps.py

@@ -100,12 +100,73 @@ def safe_rmtree(directory: str) -> bool:
             f"{Fore.RED}Permission denied when removing {directory}. Please ensure no files are in use and you have proper permissions.{Style.RESET_ALL}"
         )
         return False
+
+
+def cleanup_multiproxy_instances_dir(
+    instances_dir: str = "m4b_proxy_instances",
+    backup_root: str = ".backup",
+) -> None:
+    """
+    Clean up multiproxy instances directory when multiproxy is disabled.
+
+    Behavior:
+    - If directory does not exist: no-op
+    - If directory is empty: remove it
+    - If directory has content: move it to a timestamped backup folder
+
+    Args:
+        instances_dir (str): Path to multiproxy instances directory.
+        backup_root (str): Path to backup root directory.
+    """
+    if not os.path.isdir(instances_dir):
+        logging.info(
+            "No multiproxy instances directory found. Nothing to clean up."
+        )
+        return
+
+    try:
+        entries = os.listdir(instances_dir)
     except Exception as e:
-        logging.error(f"Failed to remove directory {directory}: {str(e)}")
+        logging.error(
+            f"Unable to inspect multiproxy instances directory '{instances_dir}': {str(e)}"
+        )
+        return
+
+    if not entries:
+        if safe_rmtree(instances_dir):
+            print(
+                f"{Fore.GREEN}Removed empty multiproxy instances directory '{instances_dir}'.{Style.RESET_ALL}"
+            )
+            logging.info(
+                f"Removed empty multiproxy instances directory '{instances_dir}'."
+            )
+        return
+
+    timestamp = time.strftime("%Y%m%d_%H%M%S")
+    backup_base_dir = os.path.join(backup_root, "m4b_proxy_instances")
+    os.makedirs(backup_base_dir, exist_ok=True)
+    backup_dir = os.path.join(backup_base_dir, f"instances_{timestamp}")
+
+    suffix = 1
+    while os.path.exists(backup_dir):
+        backup_dir = os.path.join(backup_base_dir, f"instances_{timestamp}_{suffix}")
+        suffix += 1
+
+    try:
+        shutil.move(instances_dir, backup_dir)
         print(
-            f"{Fore.RED}Failed to remove directory {directory}: {str(e)}{Style.RESET_ALL}"
+            f"{Fore.YELLOW}Multiproxy disabled: moved existing instances to '{backup_dir}'.{Style.RESET_ALL}"
+        )
+        logging.info(
+            f"Multiproxy disabled. Moved '{instances_dir}' to backup '{backup_dir}'."
+        )
+    except Exception as e:
+        logging.error(
+            f"Failed to move multiproxy instances directory '{instances_dir}' to backup: {str(e)}"
+        )
+        print(
+            f"{Fore.RED}Failed to back up multiproxy instances directory '{instances_dir}'.{Style.RESET_ALL}"
         )
-        return False
 
 
 def ipv4_to_int(ip_address: str) -> int:
@@ -745,7 +806,7 @@ def setup_watchtower(user_config: dict[str, Any]) -> None:
     if ask_question_yn(
         "Do you want M4B to manage container auto-updates via its built-in Watchtower?\n"
         "(Disable only if another Watchtower instance is already running on this host)",
-        default=current_enabled,
+        default=True,
     ):
         watchtower_config["enabled"] = True
         print("M4B built-in Watchtower enabled. Container images will be auto-updated.")
@@ -1074,6 +1135,7 @@ def main(app_config_path: str, m4b_config_path: str, user_config_path: str) -> N
                 user_config["proxies"]["url"] = ""
                 user_config["proxies"]["enabled"] = False
                 write_json(user_config, user_config_path)
+            cleanup_multiproxy_instances_dir()
             assemble_docker_compose(
                 m4b_config_path,
                 app_config_path,