Better Startup

Author: gccody

.gitignore

@@ -150,3 +150,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 *.db
+*.db-journal

launcher.py

@@ -1,3 +1,4 @@
+import asyncio
 import atexit
 import glob
 import sys
@@ -10,6 +11,7 @@
 from lib.bot import Bot
 from lib.config import Config
 from lib.progress import Progress
+from asyncer import asyncify
 
 COGS = [path.split("\\")[-1][:-3] if "\\" in path else path.split("/")[-1][:-3] for path in
         glob.glob('./lib/cogs/*.py')]
@@ -27,7 +29,7 @@ def start(cluster_id: int):
     progress = Progress("Registering Cogs", len(COGS))
     for index, cog in enumerate(COGS):
         bot.load_extension(f"lib.cogs.{cog}")
-        sleep(.2)
+        # sleep(.2)
         progress.next()
     atexit.register(bot.db.commit)
     bot.run(bot.config.token)

lib/bot/__init__.py

@@ -1,27 +1,26 @@
 import asyncio
+import json
 import os
-
-import psutil
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
-import tzlocal
-
 from datetime import datetime
-import json
+from http.client import HTTPException
 from typing import Any
 
 import discord
+import psutil
+import tzlocal
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from discord import Interaction, Guild
+from discord.embeds import Embed
+from discord.errors import NotFound
 from discord.ext.commands import AutoShardedBot as BaseBot
 from discord.ext.commands.errors import CommandNotFound, BadArgument, MissingRequiredArgument, CommandOnCooldown, \
     MissingPermissions, BotMissingPermissions
-from discord.errors import NotFound
-from http.client import HTTPException
-from discord.embeds import Embed
+
 from lib.config import Config
-from lib.db import DB
-from discord import Interaction, Guild
 from lib.context import CustomContext
-from lib.urban import UrbanDictionary
+from lib.db import DB
 from lib.progress import Progress
+from lib.urban import UrbanDictionary
 
 COMMAND_ERROR_REGEX = r"Command raised an exception: (.*?(?=: )): (.*)"
 IGNORE_EXCEPTIONS = (CommandNotFound, BadArgument, RuntimeError)
@@ -34,37 +33,35 @@ def __init__(self, shards: list[int], version: str):
         self.db.build()
         self.cache: dict = dict()
         self.tasks = AsyncIOScheduler(timezone=str(tzlocal.get_localzone()))
-        self.logged_in = False
         self.shards_ready = False
         self.ready = False
         self.expected_shards = len(shards)
+        self.shard_progress = Progress('Shards Ready', self.expected_shards)
         self.urban: UrbanDictionary = UrbanDictionary()
         self.VERSION = version
         super().__init__(
-                         owner_id="507214515641778187",
-                         shards=shards,
-                         intents=discord.Intents.all(),
-                         debug_guilds=["1064582321728143421"],
-                         description="Misc Bot used for advanced moderation and guild customization")
+            owner_id="507214515641778187",
+            shards=shards,
+            intents=discord.Intents.all(),
+            debug_guilds=["1064582321728143421"],
+            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):
-        self.tasks.start()
         await self.sync_commands()
+        while not self.shards_ready:
+            await asyncio.sleep(.5)
         print(f"Signed into {self.user.display_name}#{self.user.discriminator}")
-        self.logged_in = True
-        if self.shards_ready and self.logged_in:
-            self.register_guilds()
+        self.register_guilds()
 
     async def on_shard_ready(self, shard_id):
         await self.change_presence(activity=discord.Activity(type=discord.ActivityType.watching,
                                                              name=f"SHARD {shard_id}"),
                                    shard_id=shard_id)
-        print(f"Shard Ready [{shard_id+1}/{self.shard_count}]")
-        if shard_id+1 == self.expected_shards:
+        self.shard_progress.next()
+        if shard_id + 1 == self.expected_shards:
             self.shards_ready = True
-        if self.shards_ready and self.logged_in:
-            self.register_guilds()
 
     def register_guilds(self):
         progress = Progress('Registering guilds', len(self.guilds))
@@ -73,16 +70,14 @@ def register_guilds(self):
             progress.next()
         self.db.commit()
         self.ready = True
+        self.tasks.start()
         print('\nEverything is ready!')
 
     async def get_application_context(
-        self, interaction: Interaction, cls=CustomContext
+            self, interaction: Interaction, cls=CustomContext
     ):
         return await super().get_application_context(interaction, cls=cls)
 
-    async def on_disconnect(self):
-        print(f"Bot Disconnected, Retrying to sign into user {self.user.display_name}#{self.user.discriminator}")
-
     async def on_guild_join(self, guild: Guild):
         self.db.execute("""INSERT OR IGNORE INTO guilds VALUES (?,?,?)""", guild.id, None, None)
 
@@ -115,7 +110,8 @@ async def on_interaction(self, interaction: discord.Interaction):
         if interaction.is_command():
             name_list, options = self.get_name(interaction.data, [])
             name = " ".join(name_list)
-            self.db.execute(f"""INSERT INTO commands VALUES (?,?,?,?,?)""", name, interaction.guild_id, interaction.user.id, json.dumps(options), datetime.now().timestamp())
+            self.db.execute(f"""INSERT INTO commands VALUES (?,?,?,?,?)""", name, interaction.guild_id,
+                            interaction.user.id, json.dumps(options), datetime.now().timestamp())
         return await super().on_interaction(interaction=interaction)
 
     async def on_application_command_error(self, ctx: CustomContext, exc) -> None:
@@ -137,7 +133,8 @@ async def on_application_command_error(self, ctx: CustomContext, exc) -> None:
             embed: Embed = Embed(title="Http Error", description='Message failed to send', colour=0xff0000)
             await ctx.respond(embed=embed)
         elif isinstance(exc, NotFound):
-            await ctx.respond(embed=Embed(title='Not Found Error', description='One or more items could not be found.', colour=0xff0000))
+            await ctx.respond(embed=Embed(title='Not Found Error', description='One or more items could not be found.',
+                                          colour=0xff0000))
         elif hasattr(exc, "original"):
             if isinstance(exc.original, HTTPException):
                 embed: Embed = Embed(title="Http Error", description='Message failed to send', colour=0xff0000)
@@ -159,4 +156,3 @@ async def cpu_percent(interval=None, *args, **kwargs):
             python_process.cpu_percent(*args, **kwargs)
             await asyncio.sleep(interval)
         return psutil.cpu_percent(*args, **kwargs)
-

lib/db/__init__.py

@@ -137,7 +137,6 @@ def build(self) -> None:
                 data = re.search(r"\((?<=\()(?:.)+", create_table_query).group()
                 self.update_table(table_name, data)
                 progress.next()
-                time.sleep(.2)
         self.commit()
 
     def commit(self) -> None:

lib/progress/__init__.py

@@ -1,16 +1,24 @@
+from datetime import datetime
 import sys
+import asyncio
+from functools import wraps, partial
 
 
 class Progress:
     def __init__(self, msg: str, total: int):
         self.msg = msg
         self.iteration = 0
         self.total = total
+
+    def start(self):
         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}]")
         sys.stdout.flush()
         if self.iteration == self.total: