CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Core] Cog load fixes (#2854)

Browse Source 
* split out some fixes from red#2853

* address feedback

* feedback
This commit is contained in:
Michael H 2019-07-12 22:11:06 -04:00 committed by GitHub
parent e34eca557b
commit ac2813012a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
redbot/core/bot.py
View File

@ -407,9 +407,14 @@ class RedBase(commands.GroupMixin, commands.bot.BotBase, RPCMixin): # pylint: d
f"not inherit from the commands.Cog base class. The cog author must update " f"not inherit from the commands.Cog base class. The cog author must update "
f"the cog to adhere to this requirement." f"the cog to adhere to this requirement."
) )
if cog.__cog_name__ in self.cogs:
raise RuntimeError(f"There is already a cog named {cog.__cog_name__} loaded.")
if not hasattr(cog, "requires"): if not hasattr(cog, "requires"):
commands.Cog.__init__(cog) commands.Cog.__init__(cog)
added_hooks = []
try:
for cls in inspect.getmro(cog.__class__): for cls in inspect.getmro(cog.__class__):
try: try:
hook = getattr(cog, f"_{cls.__name__}__permissions_hook") hook = getattr(cog, f"_{cls.__name__}__permissions_hook")
@ -417,6 +422,7 @@ class RedBase(commands.GroupMixin, commands.bot.BotBase, RPCMixin): # pylint: d
pass pass
else: else:
self.add_permissions_hook(hook) self.add_permissions_hook(hook)
added_hooks.append(hook)
for command in cog.__cog_commands__: for command in cog.__cog_commands__:
@ -433,6 +439,18 @@ class RedBase(commands.GroupMixin, commands.bot.BotBase, RPCMixin): # pylint: d
self.dispatch("cog_add", cog) self.dispatch("cog_add", cog)
for command in cog.__cog_commands__: for command in cog.__cog_commands__:
self.dispatch("command_add", command) self.dispatch("command_add", command)
except Exception:
for hook in added_hooks:
try:
self.remove_permissions_hook(hook)
except Exception:
# This shouldn't be possible
log.exception(
"A hook got extremely screwed up, "
"and could not be removed properly during another error in cog load."
)
del cog
raise
def clear_permission_rules(self, guild_id: Optional[int]) -> None: def clear_permission_rules(self, guild_id: Optional[int]) -> None:
"""Clear all permission overrides in a scope. """Clear all permission overrides in a scope.