Small changes

Author: gccody

launcher.py

@@ -3,6 +3,7 @@
 import glob
 import math
 from http.client import HTTPException
+from signal import signal, SIGINT, SIGTERM
 
 import discord
 import numpy as np
@@ -73,10 +74,13 @@ async def on_command_error(ctx: Interaction, exc) -> None:
             else:
                 raise exc
 
-    async def exit_handler():
-        asyncio.run(bot.db.commit())
-
-    atexit.register(asyncio.run, (exit_handler,))
+    def close():
+        bot.loop.run_until_complete(bot.close())
+        bot.loop.stop()
+        bot.loop.close()
+        exit()
+    atexit.register(close)
+    # signal(SIGINT, close)
     await bot.db.build()
     await bot.start(bot.config.token)
 

lib/bot/__init__.py

@@ -67,7 +67,7 @@ async def on_connect(self):
         await self.register_guilds()
         asyncio.ensure_future(self.monitor_shutdown())
         print(f"Signed into {self.user.display_name}#{self.user.discriminator}")
-        asyncio.ensure_future(self.timer.start())
+        # asyncio.ensure_future(self.timer.start())
 
     async def on_shard_ready(self, shard_id):
         await self.change_presence(activity=discord.Activity(type=discord.ActivityType.watching,

lib/db/__init__.py

@@ -263,4 +263,5 @@ async def close(self) -> None:
         await self.cxn.close()
 
     async def run(self, command, *values) -> None:
-        await self.cur.execute(command, tuple(values))
+        await self.cur.execute(command, tuple(values))
+        await self.commit()

lib/progress/__init__.py

@@ -46,15 +46,15 @@ def __init__(self, msg: str, total: int):
         self.total = total
 
     def start(self):
-        sys.stdout.write(f"\r{self.msg} {self.iteration/self.total*100:.2f}%")
+        sys.stdout.write(f"\r{self.msg} [{self.iteration}/{self.total}]")
         sys.stdout.flush()
 
     def next(self):
         if not self.total:
             print(self.msg)
         self.iteration += 1
         if self.iteration > self.total: raise ValueError("Can't iterate more then the total")
-        sys.stdout.write(f"\r{self.msg} {self.iteration/self.total*100:.2f}%")
+        sys.stdout.write(f"\r{self.msg} [{self.iteration}/{self.total}]")
         sys.stdout.flush()
         if self.iteration == self.total:
             print("")