Remove dir when plugin remove

Author: Taaku18

CHANGELOG.md

@@ -31,7 +31,8 @@ however, insignificant breaking changes does not guarantee a major version bump,
 
 - Reworked `config.get` and `config.set`, it feeds through the converters before setting/getting.
   - To get/set the raw value, access through `config[]`.
-- Prerelease naming scheme is now `x.x.x-dev`.
+- Prerelease naming scheme is now `x.x.x-devN`.
+- `trigger_typing` has been moved to `core.utils.trigger_typing`, original location is deprecated.
 
 # v3.2.2
 

cogs/modmail.py

@@ -13,11 +13,10 @@
 from natural.date import duration
 
 from core import checks
-from core.decorators import trigger_typing
 from core.models import PermissionLevel
 from core.paginator import EmbedPaginatorSession
 from core.time import UserFriendlyTime, human_timedelta
-from core.utils import format_preview, User, create_not_found_embed, format_description
+from core.utils import format_preview, User, create_not_found_embed, format_description, trigger_typing
 
 logger = logging.getLogger("Modmail")
 

cogs/plugins.py

@@ -22,7 +22,7 @@
 from core import checks
 from core.models import PermissionLevel
 from core.paginator import EmbedPaginatorSession
-from core.utils import truncate
+from core.utils import truncate, trigger_typing
 
 logger = logging.getLogger("Modmail")
 
@@ -235,6 +235,14 @@ async def load_plugin(self, plugin):
 
     async def parse_user_input(self, ctx, plugin_name, check_version=False):
 
+        if not self._ready_event.is_set():
+            embed = discord.Embed(
+                description="Plugins are still loading, please try again later.",
+                color=self.bot.main_color,
+            )
+            await ctx.send(embed=embed)
+            return
+
         if plugin_name in self.registry:
             details = self.registry[plugin_name]
             user, repo = details["repository"].split("/", maxsplit=1)
@@ -281,6 +289,7 @@ async def plugins(self, ctx):
 
     @plugins.command(name="add", aliases=["install", "load"])
     @checks.has_permissions(PermissionLevel.OWNER)
+    @trigger_typing
     async def plugins_add(self, ctx, *, plugin_name: str):
         """
         Install a new plugin for the bot.
@@ -313,53 +322,51 @@ async def plugins_add(self, ctx, *, plugin_name: str):
         )
         msg = await ctx.send(embed=embed)
 
-        async with ctx.typing():
-            try:
-                await self.download_plugin(plugin, force=True)
-            except Exception:
-                logger.warning(f"Unable to download plugin %s.", plugin, exc_info=True)
-
-                embed = discord.Embed(
-                    description=f"Failed to download plugin, check logs for error.",
-                    color=self.bot.error_color,
-                )
-
-                return await msg.edit(embed=embed)
+        try:
+            await self.download_plugin(plugin, force=True)
+        except Exception:
+            logger.warning(f"Unable to download plugin %s.", plugin, exc_info=True)
 
-            self.bot.config["plugins"].append(str(plugin))
-            await self.bot.config.update()
+            embed = discord.Embed(
+                description=f"Failed to download plugin, check logs for error.",
+                color=self.bot.error_color,
+            )
 
-            if self.bot.config.get("enable_plugins"):
+            return await msg.edit(embed=embed)
 
-                invalidate_caches()
+        self.bot.config["plugins"].append(str(plugin))
+        await self.bot.config.update()
 
-                try:
-                    await self.load_plugin(plugin)
-                except Exception:
-                    logger.warning(f"Unable to load plugin %s.", plugin, exc_info=True)
+        if self.bot.config.get("enable_plugins"):
 
-                    embed = discord.Embed(
-                        description=f"Failed to download plugin, check logs for error.",
-                        color=self.bot.error_color,
-                    )
+            invalidate_caches()
 
-                    return await msg.edit(embed=embed)
+            try:
+                await self.load_plugin(plugin)
+            except Exception:
+                logger.warning(f"Unable to load plugin %s.", plugin, exc_info=True)
 
                 embed = discord.Embed(
-                    description="Successfully installed plugin.\n"
-                    "*Friendly reminder, plugins have absolute control over your bot. "
-                    "Please only install plugins from developers you trust.*",
-                    color=self.bot.main_color,
+                    description=f"Failed to download plugin, check logs for error.",
+                    color=self.bot.error_color,
                 )
+
             else:
                 embed = discord.Embed(
                     description="Successfully installed plugin.\n"
                     "*Friendly reminder, plugins have absolute control over your bot. "
-                    "Please only install plugins from developers you trust.*\n\n"
-                    "This plugin is currently not enabled due to `ENABLE_PLUGINS=false`, "
-                    "to re-enable plugins, remove or change `ENABLE_PLUGINS=true` and restart your bot.",
+                    "Please only install plugins from developers you trust.*",
                     color=self.bot.main_color,
                 )
+        else:
+            embed = discord.Embed(
+                description="Successfully installed plugin.\n"
+                "*Friendly reminder, plugins have absolute control over your bot. "
+                "Please only install plugins from developers you trust.*\n\n"
+                "This plugin is currently not enabled due to `ENABLE_PLUGINS=false`, "
+                "to re-enable plugins, remove or change `ENABLE_PLUGINS=true` and restart your bot.",
+                color=self.bot.main_color,
+            )
         return await msg.edit(embed=embed)
 
     @plugins.command(name="remove", aliases=["del", "delete"])
@@ -390,6 +397,15 @@ async def plugins_remove(self, ctx, *, plugin_name: str):
 
         self.bot.config["plugins"].remove(str(plugin))
         await self.bot.config.update()
+        shutil.rmtree(
+            plugin.abs_path,
+            onerror=lambda *args: logger.warning('Failed to remove plugin files %s: %s', plugin, str(args[2]))
+        )
+        try:
+            plugin.abs_path.parent.rmdir()
+            plugin.abs_path.parent.parent.rmdir()
+        except OSError:
+            pass  # dir not empty
 
         embed = discord.Embed(
             description="The plugin is successfully uninstalled.",

cogs/utility.py

@@ -24,7 +24,6 @@
 
 from core import checks
 from core.changelog import Changelog
-from core.decorators import trigger_typing
 from core.models import InvalidConfigError, PermissionLevel
 from core.paginator import EmbedPaginatorSession, MessagePaginatorSession
 from core import utils
@@ -248,7 +247,7 @@ def cog_unload(self):
 
     @commands.command()
     @checks.has_permissions(PermissionLevel.REGULAR)
-    @trigger_typing
+    @utils.trigger_typing
     async def changelog(self, ctx, version: str.lower = ""):
         """Shows the changelog of the Modmail."""
         changelog = await Changelog.from_url(self.bot)
@@ -282,7 +281,7 @@ async def changelog(self, ctx, version: str.lower = ""):
 
     @commands.command(aliases=["bot", "info"])
     @checks.has_permissions(PermissionLevel.REGULAR)
-    @trigger_typing
+    @utils.trigger_typing
     async def about(self, ctx):
         """Shows information about this bot."""
         embed = discord.Embed(color=self.bot.main_color, timestamp=datetime.utcnow())
@@ -331,7 +330,7 @@ async def about(self, ctx):
 
     @commands.command()
     @checks.has_permissions(PermissionLevel.REGULAR)
-    @trigger_typing
+    @utils.trigger_typing
     async def sponsors(self, ctx):
         """Shows a list of sponsors."""
         resp = await self.bot.session.get(
@@ -352,7 +351,7 @@ async def sponsors(self, ctx):
 
     @commands.group(invoke_without_command=True)
     @checks.has_permissions(PermissionLevel.OWNER)
-    @trigger_typing
+    @utils.trigger_typing
     async def debug(self, ctx):
         """Shows the recent application-logs of the bot."""
 
@@ -407,7 +406,7 @@ async def debug(self, ctx):
 
     @debug.command(name="hastebin", aliases=["haste"])
     @checks.has_permissions(PermissionLevel.OWNER)
-    @trigger_typing
+    @utils.trigger_typing
     async def debug_hastebin(self, ctx):
         """Posts application-logs to Hastebin."""
 
@@ -450,7 +449,7 @@ async def debug_hastebin(self, ctx):
 
     @debug.command(name="clear", aliases=["wipe"])
     @checks.has_permissions(PermissionLevel.OWNER)
-    @trigger_typing
+    @utils.trigger_typing
     async def debug_clear(self, ctx):
         """Clears the locally cached logs."""
 
@@ -658,7 +657,7 @@ async def before_loop_presence(self):
 
     @commands.command()
     @checks.has_permissions(PermissionLevel.ADMINISTRATOR)
-    @trigger_typing
+    @utils.trigger_typing
     async def ping(self, ctx):
         """Pong! Returns your websocket latency."""
         embed = discord.Embed(

core/decorators.py

@@ -1,12 +1,10 @@
-import functools
+import warnings
 
-from discord.ext import commands
+from core.utils import trigger_typing as _trigger_typing
 
 
 def trigger_typing(func):
-    @functools.wraps(func)
-    async def wrapper(self, ctx: commands.Context, *args, **kwargs):
-        await ctx.trigger_typing()
-        return await func(self, ctx, *args, **kwargs)
-
-    return wrapper
+    warnings.warn("trigger_typing has been moved to core.utils.trigger_typing, this will be removed.",
+                  DeprecationWarning,
+                  stacklevel=2)
+    return _trigger_typing(func)

core/utils.py

@@ -1,3 +1,4 @@
+import functools
 import re
 import shlex
 import typing
@@ -250,3 +251,12 @@ def format_description(i, names):
         ": ".join((str(a + i * 15), b))
         for a, b in enumerate(takewhile(lambda x: x is not None, names), start=1)
     )
+
+
+def trigger_typing(func):
+    @functools.wraps(func)
+    async def wrapper(self, ctx: commands.Context, *args, **kwargs):
+        await ctx.trigger_typing()
+        return await func(self, ctx, *args, **kwargs)
+
+    return wrapper