better error handling

Author: DigiDuncan

sizebot/cogs/edge.py

@@ -137,7 +137,7 @@ async def clearlargest(self, ctx: GuildContext):
     async def edgedebug(self, ctx: GuildContext):
         userdata = userdb.load(ctx.guild.id, ctx.author.id)
         usersizes = getUserSizes(ctx.guild)
-        guilddata = guilddb.load(ctx.guild.id)
+        guilddata = guilddb.load_or_create(ctx.guild.id)
         sm = guilddata.small_edge
         lg = guilddata.large_edge
 
@@ -159,7 +159,7 @@ async def on_message(self, m: discord.Message):
             return
 
         try:
-            guilddata = guilddb.load(m.guild.id)
+            guilddata = guilddb.load_or_create(m.guild.id)
         except GuildNotFoundException:
             return  # Guild does not have edges set
 

sizebot/cogs/limits.py

@@ -160,7 +160,7 @@ async def on_message(self, m: discord.Message):
         except UserNotFoundException:
             return
         try:
-            guilddata = guilddb.load(m.guild.id)
+            guilddata = guilddb.load_or_create(m.guild.id)
         except GuildNotFoundException:
             return
 

sizebot/lib/changes.py

@@ -75,7 +75,7 @@ async def apply(self, bot: commands.Bot) -> bool:
         addPerTick = cast(SV, self.addPerSec * seconds)
         mulPerTick = cast(Decimal, self.mulPerSec ** seconds)
         powPerTick = cast(Decimal, self.powPerSec ** seconds)
-        guilddata = guilddb.load(self.guildid)
+        guilddata = guilddb.load_or_create(self.guildid)
         userdata = userdb.load(self.guildid, self.userid)
         newheight = cast(SV, ((userdata.height ** powPerTick) * mulPerTick) + addPerTick)
 

sizebot/lib/errors.py

@@ -287,6 +287,14 @@ def formatMessage(self) -> str:
     def formatUserMessage(self) -> str:
         return f"Could not calculate the {self.s} stat(s)."
 
+class DatabaseLoadException(DigiException):
+    def __init__(self, f: str):
+        self.f = f
+
+    # TODO: CamelCase
+    def formatUserMessage(self) -> str:
+        return f"The database file {self.f} failed to load."
+
 
 def sentence_join(items: Iterable[str], *, joiner: str | None = None, oxford: bool = False) -> str:
     """Join a list of strings like a sentence.

sizebot/lib/userdb.py

@@ -432,7 +432,10 @@ def load(guildid: int, userid: int, *, member: discord.Member = None, allow_unre
     path = get_user_path(guildid, userid)
     try:
         with open(path, "r") as f:
-            jsondata = json.load(f)
+            try:
+                jsondata = json.load(f)
+            except json.JSONDecodeError as e:
+                raise errors.DatabaseLoadException(str(path.absolute())) from e
     except FileNotFoundError:
         raise errors.UserNotFoundException(guildid, userid)
     user = User.fromJSON(jsondata)