From 7d547130ea8a303ad72e9835ac5479ff2fc0184b Mon Sep 17 00:00:00 2001
From: rambros <rambrosteam@gmail.com>
Date: Sun, 1 Mar 2026 18:35:38 +0530
Subject: [PATCH] include graceful exits

---
 disco-reaper.py      | 11 ++++---
 server-shuttle.py    |  2 +-
 src/ui/reaper_app.py | 76 +++++++++++++++++++++++---------------------
 3 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/disco-reaper.py b/disco-reaper.py
index bb5a989..584b5da 100644
--- a/disco-reaper.py
+++ b/disco-reaper.py
@@ -61,13 +61,14 @@ def relaunch_in_terminal():
 async def main():
     relaunch_in_terminal()
     setup_logging()
+    await run_disco_reaper()
+
+if __name__ == "__main__":
     try:
-        await run_disco_reaper()
+        asyncio.run(main())
     except KeyboardInterrupt:
-        print("\nExiting...")
+        print("\nOperation terminated by user.")
+        sys.exit(0)
     except Exception as e:
         print(f"Error: {e}")
         sys.exit(1)
-
-if __name__ == "__main__":
-    asyncio.run(main())
diff --git a/server-shuttle.py b/server-shuttle.py
index d6444c7..5a4c766 100644
--- a/server-shuttle.py
+++ b/server-shuttle.py
@@ -148,8 +148,8 @@ def main():
     relaunch_in_terminal()
     config = load_config()
     setup_logging()
-    platform = select_platform(config)
     try:
+        platform = select_platform(config)
         asyncio.run(run_cli(target_platform=platform))
     except KeyboardInterrupt:
         print("\nOperation terminated by user.")
diff --git a/src/ui/reaper_app.py b/src/ui/reaper_app.py
index 3d6f671..3597ec2 100644
--- a/src/ui/reaper_app.py
+++ b/src/ui/reaper_app.py
@@ -96,42 +96,46 @@ class DiscoReaperCLI:
     async def run(self):
         await self.validate_config()
 
-        while True:
-            console.print("")
-            console.print(Panel.fit("Disco Reaper - Server Backup Tool", style="bold green"))
-            
-            d_name = self.validation_results.get("discord_server_name")
-            d_display = f"[bold green]\"{d_name}\"[/bold green]" if d_name else "[bold red]NOT CONNECTED[/bold red]"
-            console.print(f"[bold cyan]Source Server:[/bold cyan] {d_display}")
-            
-            b_name = self.validation_results.get("discord_bot_name")
-            b_display = f"[bold green]\"{b_name}\"[/bold green]" if b_name else "[bold red]UNKNOWN[/bold red]"
-            console.print(f"[bold cyan]Bot name:[/bold cyan] {b_display}")
-            
-            backup_ts = self.get_backup_info()
-            if backup_ts:
-                console.print(f"[bold cyan]Backup Found:[/bold cyan] [bold yellow]{backup_ts}[/bold yellow]")
-            
-            console.print("\n[bold]Main Menu[/bold]")
-            console.print("(1) Backup Server Profile")
-            console.print("(2) Backup Channel Messages")
-            console.print("(3) Update & Sync Backup")
-            console.print("(4) Configuration")
-            console.print("(Q) Exit")
-            
-            choice = Prompt.ask("\nSelect an option", choices=["1", "2", "3", "4", "Q"], default="Q", show_choices=False).upper()
-            
-            if choice == "1":
-                await self.backup_server_profile()
-            elif choice == "2":
-                await self.backup_messages()
-            elif choice == "3":
-                await self.sync_backup()
-            elif choice == "4":
-                await self.edit_configuration()
-            elif choice == "Q":
-                await self.engine.close_connections()
-                break
+        try:
+            while True:
+                console.print("")
+                console.print(Panel.fit("Disco Reaper - Server Backup Tool", style="bold green"))
+                
+                d_name = self.validation_results.get("discord_server_name")
+                d_display = f"[bold green]\"{d_name}\"[/bold green]" if d_name else "[bold red]NOT CONNECTED[/bold red]"
+                console.print(f"[bold cyan]Source Server:[/bold cyan] {d_display}")
+                
+                b_name = self.validation_results.get("discord_bot_name")
+                b_display = f"[bold green]\"{b_name}\"[/bold green]" if b_name else "[bold red]UNKNOWN[/bold red]"
+                console.print(f"[bold cyan]Bot name:[/bold cyan] {b_display}")
+                
+                backup_ts = self.get_backup_info()
+                if backup_ts:
+                    console.print(f"[bold cyan]Backup Found:[/bold cyan] [bold yellow]{backup_ts}[/bold yellow]")
+                
+                console.print("\n[bold]Main Menu[/bold]")
+                console.print("(1) Backup Server Profile")
+                console.print("(2) Backup Channel Messages")
+                console.print("(3) Update & Sync Backup")
+                console.print("(4) Configuration")
+                console.print("(Q) Exit")
+                
+                choice = Prompt.ask("\nSelect an option", choices=["1", "2", "3", "4", "Q"], default="Q", show_choices=False).upper()
+                
+                if choice == "1":
+                    await self.backup_server_profile()
+                elif choice == "2":
+                    await self.backup_messages()
+                elif choice == "3":
+                    await self.sync_backup()
+                elif choice == "4":
+                    await self.edit_configuration()
+                elif choice == "Q":
+                    break
+        except (KeyboardInterrupt, asyncio.CancelledError):
+            console.print("\n[yellow]Operation terminated by user.[/yellow]")
+        finally:
+            await self.engine.close_connections()
 
     async def backup_server_profile(self):
         """Option 1: Backup name, banner, logo, roles, structure, and custom assets."""