ryujinx-archive/ryuko-ng
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

err: Further cleanup of tomGER's code

Browse source 
I dislike .format() :)
This commit is contained in:
Ave Ozkal 2018-12-23 20:42:01 +03:00
parent 5d54ac7aec
commit b2a907babf
No known key found for this signature in database
GPG key ID: 09356ABAA42C842B
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cogs/err.py
View file

@ -33,7 +33,7 @@ class Err:
# Send message, crazy # Send message, crazy
await ctx.send(embed=embed) await ctx.send(embed=embed)
elif err.startswith("0x"): # These are not similar to the other errors apperently ... ? elif err.startswith("0x"): # These are not similar to the other errors apparently ... ?
derr = err[2:] derr = err[2:]
derr = derr.strip() derr = derr.strip()
rc = int(derr, 16) rc = int(derr, 16)
@ -43,7 +43,7 @@ class Err:
level = (rc >> 27) & 0x1F level = (rc >> 27) & 0x1F
if mod in dds_modules and summ in dds_summaries and desc in dds_descriptions and level in dds_levels: if mod in dds_modules and summ in dds_summaries and desc in dds_descriptions and level in dds_levels:
# ^ Lets just make extra sure that everything is right :P # ^ Lets just make extra sure that everything is right :P
embed = discord.Embed(title="0x{:X}".format(rc)) embed = discord.Embed(title=f"0x{rc:X}")
embed.add_field(name="Module", value=dds_modules[mod], inline=False) embed.add_field(name="Module", value=dds_modules[mod], inline=False)
embed.add_field(name="Description", value=dds_descriptions[desc], inline=False) embed.add_field(name="Description", value=dds_descriptions[desc], inline=False)
embed.add_field(name="Summary", value=dds_summaries[summ], inline=False) embed.add_field(name="Summary", value=dds_summaries[summ], inline=False)
@ -59,10 +59,12 @@ class Err:
if err in wii_u_errors: if err in wii_u_errors:
err_description = wii_u_errors[err] err_description = wii_u_errors[err]
else: else:
err_description = "It seems like your error code is unknown. You should report relevant details to <@141532589725974528> so it can be added to the bot." err_description = "It seems like your error code is unknown. You should report relevant details to <@141532589725974528> (tomGER) so it can be added to the bot."
# Make a nice Embed out of it # Make a nice Embed out of it
embed = discord.Embed(title=err, url="https://www.youtube.com/watch?v=x3yXlomPCmU", description=err_description) embed = discord.Embed(title=err,
url="https://www.youtube.com/watch?v=x3yXlomPCmU",
description=err_description)
embed.set_footer(text="Console: Wii U") embed.set_footer(text="Console: Wii U")
embed.add_field(name="Module", value=module, inline=True) embed.add_field(name="Module", value=module, inline=True)
embed.add_field(name="Description", value=desc, inline=True) embed.add_field(name="Description", value=desc, inline=True)
@ -82,7 +84,7 @@ class Err:
desc = int(err[5:9]) desc = int(err[5:9])
errcode = (desc << 9) + module errcode = (desc << 9) + module
str_errcode = '{:04}-{:04}'.format(module + 2000, desc) str_errcode = f'{(module + 2000):04}-{desc:04}'
# Searching for Modules in list # Searching for Modules in list
if module in switch_modules: if module in switch_modules:
@ -103,9 +105,11 @@ class Err:
err_description = "It seems like your error code is unknown. You should report relevant details to <@141532589725974528> so it can be added to the bot." err_description = "It seems like your error code is unknown. You should report relevant details to <@141532589725974528> so it can be added to the bot."
# Make a nice Embed out of it # Make a nice Embed out of it
embed = discord.Embed(title="{} / {}".format(str_errcode, hex(errcode)), url="https://www.youtube.com/watch?v=x3yXlomPCmU", description=err_description) embed = discord.Embed(title=f"{str_errcode} / {hex(errcode)}",
url="https://www.youtube.com/watch?v=x3yXlomPCmU",
description=err_description)
embed.set_footer(text="Console: Switch") embed.set_footer(text="Console: Switch")
embed.add_field(name="Module", value="{} ({})".format(err_module, module), inline=True) embed.add_field(name="Module", value=f"{err_module} ({module})", inline=True)
embed.add_field(name="Description", value=desc, inline=True) embed.add_field(name="Description", value=desc, inline=True)
# Send message, crazy # Send message, crazy
@ -144,7 +148,7 @@ class Err:
err = int(err, 16) err = int(err, 16)
module = err & 0x1FF module = err & 0x1FF
desc = (err >> 9) & 0x3FFF desc = (err >> 9) & 0x3FFF
errcode = '{:04}-{:04}'.format(module + 2000, desc) errcode = f'{(module + 2000):04}-{desc:04}'
await ctx.send(errcode) await ctx.send(errcode)
else: else:
await ctx.send("This doesn't look like typical hex!") await ctx.send("This doesn't look like typical hex!")