Add loading animation and cleanup

Author: gccody

launcher.py

@@ -2,6 +2,8 @@
 import atexit
 import glob
 import math
+import os
+import sys
 from http.client import HTTPException
 from signal import signal, SIGINT, SIGTERM
 
@@ -28,8 +30,12 @@
 SHARDS_SPLIT: list[np.ndarray[int]] = np.array_split(SHARDS_LIST, CLUSTERS)
 
 
+bots: list[Bot] = []
+
+
 async def start():
     bot = Bot(SHARDS_LIST, VERSION)
+    bots.append(bot)
     progress = Progress("Registering Cogs", len(COGS))
     for index, cog in enumerate(COGS):
         await bot.load_extension(f"lib.cogs.{cog}")
@@ -76,14 +82,15 @@ async def on_command_error(ctx: Interaction, exc) -> None:
 
     def close():
         bot.loop.run_until_complete(bot.close())
-        bot.loop.stop()
-        bot.loop.close()
         exit()
     atexit.register(close)
-    # signal(SIGINT, close)
+    signal(SIGINT, close)
     await bot.db.build()
     await bot.start(bot.config.token)
 
 
 if __name__ == '__main__':
-    asyncio.run(start())
+    try:
+        asyncio.run(start())
+    except (KeyboardInterrupt, TypeError):
+        print("Press again to close...")

lib/bot/__init__.py

@@ -18,7 +18,7 @@
 
 from lib.config import Config
 from lib.db import DB
-from lib.progress import Progress, Timer
+from lib.progress import Progress, Timer, Loading
 from lib.urban import UrbanDictionary
 
 COMMAND_ERROR_REGEX = r"Command raised an exception: (.*?(?=: )): (.*)"
@@ -55,17 +55,20 @@ def __init__(self, shards: list[int], version: str):
             owner_id="507214515641778187",
             shards=shards,
             intents=discord.Intents.all(),
-            description="Misc Bot used for advanced moderation and guild customization")
+            description="Misc Bot used for advanced moderation and guild customization",)
         self.tasks.add_job(self.db.commit, trigger='interval', minutes=30)
         self.shard_progress.start()
 
     async def on_connect(self):
         while not self.shards_ready:
             await asyncio.sleep(.5)
+        loading: Loading = Loading("Syncing commands")
+        asyncio.ensure_future(loading.start())
         self.tree.copy_global_to(guild=discord.Object(id="1064582321728143421"))
-        await self.tree.sync(guild=discord.Object(id="1064582321728143421"))
+        commands = await self.tree.sync(guild=discord.Object(id="1064582321728143421"))
+        loading.stop(f"Synced {len(commands)} commands")
         await self.register_guilds()
-        asyncio.ensure_future(self.monitor_shutdown())
+        # asyncio.ensure_future(self.monitor_shutdown())
         print(f"Signed into {self.user.display_name}#{self.user.discriminator}")
         # asyncio.ensure_future(self.timer.start())
 
@@ -113,13 +116,14 @@ async def monitor_shutdown(self):
         while True:
             if psutil.Process().status() == psutil.STATUS_ZOMBIE:
                 await self.db.commit()
-                break
+                await self.close()
+                raise SystemExit
             if psutil.process_iter(['pid', 'name']):
                 for process in psutil.process_iter():
                     if process.name() == 'shutdown.exe':
                         await self.db.commit()
                         await self.close()
-                        exit()
+                        raise SystemExit
             await asyncio.sleep(1)
 
     async def register_guilds(self):

lib/progress/__init__.py

@@ -1,6 +1,8 @@
-from datetime import datetime
-import sys
 import asyncio
+import sys
+from datetime import datetime
+
+from tqdm.asyncio import tqdm
 
 
 def format_str(amount: int, string: str):
@@ -63,19 +65,25 @@ def next(self):
 class Loading:
     def __init__(self, msg: str):
         self.msg = msg
-        self.step = 0
-        self.pause = .5
-        self.done = False
+        self.iter = 0
+        self.running = True
+        self.length = 0
 
     async def start(self):
-        while not self.done:
-            sys.stdout.write(f"\r{self.msg}{'.'*((self.step%3)+1)}")
+        while self.running:
+            dots = ((self.iter % 3) + 1)
+            string = f"\r{self.msg}{'.' * dots}{' '*(3-dots)}"
+            self.length = len(string)
+            sys.stdout.write(string)
             sys.stdout.flush()
-            self.step += 1
-            await asyncio.sleep(self.pause)
-            if self.done:
-                break
+            self.iter += 1
+            await asyncio.sleep(0.5)
+            if self.iter == 3:
+                self.iter = 0
+
+    def stop(self, finish_msg: str):
+        self.running = False
+        sys.stdout.write(f"\r{finish_msg}{' '*(self.length-len(finish_msg)) if len(finish_msg) <= self.length else ''}")
+        sys.stdout.flush()
         print("")
 
-    def stop(self):
-        self.done = True