mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-12-07 09:52:30 -05:00
Downloader's plurial & Fix
This commit is contained in:
Predeactor
@@ -556,9 +556,15 @@ class Downloader(commands.Cog):
|
||||
"""List all installed repos."""
|
||||
repos = self._repo_manager.repos
|
||||
sorted_repos = sorted(repos, key=lambda r: str.lower(r.name))
|
||||
joined = _("Installed Repos:\n\n")
|
||||
for repo in sorted_repos:
|
||||
joined += "+ {}: {}\n".format(repo.name, repo.short or "")
|
||||
if len(repos) == 0:
|
||||
joined = _("There is no repo installed.")
|
||||
else:
|
||||
if len(repos) > 1:
|
||||
joined = _("Installed Repos:\n\n")
|
||||
else:
|
||||
joined = _("Installed Repo:\n\n")
|
||||
for repo in sorted_repos:
|
||||
joined += "+ {}: {}\n".format(repo.name, repo.short or "")
|
||||
|
||||
for page in pagify(joined, ["\n"], shorten_by=16):
|
||||
await ctx.send(box(page.lstrip(" "), lang="diff"))
|
||||
@@ -799,20 +805,37 @@ class Downloader(commands.Cog):
|
||||
|
||||
message = ""
|
||||
if uninstalled_cogs:
|
||||
message += _("Successfully uninstalled cogs: ") + humanize_list(uninstalled_cogs)
|
||||
if failed_cogs:
|
||||
message += (
|
||||
_(
|
||||
"\nDownloader has removed these cogs from the installed cogs list"
|
||||
" but it wasn't able to find their files: "
|
||||
if len(uninstalled_cogs) > 1:
|
||||
message += _("Successfully uninstalled cogs: ") + humanize_list(
|
||||
uninstalled_cogs
|
||||
)
|
||||
else:
|
||||
message += _("Successfully uninstalled cog ") + uninstalled_cogs[0]
|
||||
if failed_cogs:
|
||||
if len(failed_cogs) > 1:
|
||||
message += (
|
||||
_(
|
||||
"\nDownloader has removed these cogs from the installed cogs list"
|
||||
" but it wasn't able to find their files: "
|
||||
)
|
||||
+ humanize_list(tuple(map(inline, failed_cogs)))
|
||||
+ _(
|
||||
"\nThey were most likely removed without using `{prefix}cog uninstall`.\n"
|
||||
"You may need to remove those files manually if the cogs are still usable."
|
||||
" If so, ensure the cogs have been unloaded with `{prefix}unload {cogs}`."
|
||||
).format(prefix=ctx.clean_prefix, cogs=" ".join(failed_cogs))
|
||||
)
|
||||
else:
|
||||
message += _(
|
||||
"\nDownloader has removed the cog {cog} from the installed cogs list"
|
||||
" but it wasn't able to find his files."
|
||||
).format(cog=inline(failed_cogs[0])) + _(
|
||||
"\nIt was most likely removed without using `{prefix}cog uninstall`.\n"
|
||||
"You may need to remove those files manually if the cog are still usable."
|
||||
" If so, ensure the cog have been unloaded with `{prefix}unload {cog}`."
|
||||
).format(
|
||||
prefix=ctx.clean_prefix, cog=failed_cogs[0]
|
||||
)
|
||||
+ humanize_list(tuple(map(inline, failed_cogs)))
|
||||
+ _(
|
||||
"\nThey were most likely removed without using `{prefix}cog uninstall`.\n"
|
||||
"You may need to remove those files manually if the cogs are still usable."
|
||||
" If so, ensure the cogs have been unloaded with `{prefix}unload {cogs}`."
|
||||
).format(prefix=ctx.clean_prefix, cogs=" ".join(failed_cogs))
|
||||
)
|
||||
await self.send_pagified(ctx, message)
|
||||
|
||||
@cog.command(name="pin", usage="<cogs>")
|
||||
@@ -833,9 +856,15 @@ class Downloader(commands.Cog):
|
||||
if pinned:
|
||||
await self._save_to_installed(pinned)
|
||||
cognames = [inline(cog.name) for cog in pinned]
|
||||
message += _("Pinned cogs: ") + humanize_list(cognames)
|
||||
if len(pinned) > 1:
|
||||
message += _("Pinned cogs: ") + humanize_list(cognames)
|
||||
else:
|
||||
message += _("Pinned {cog}").format(cognames[0])
|
||||
if already_pinned:
|
||||
message += _("\nThese cogs were already pinned: ") + humanize_list(already_pinned)
|
||||
if len(already_pinned) > 1:
|
||||
message += _("\nThese cogs were already pinned: ") + humanize_list(already_pinned)
|
||||
else:
|
||||
message += _("\n{cog} was already pinned.").format(cog=already_pinned[0])
|
||||
await self.send_pagified(ctx, message)
|
||||
|
||||
@cog.command(name="unpin", usage="<cogs>")
|
||||
@@ -856,9 +885,15 @@ class Downloader(commands.Cog):
|
||||
if unpinned:
|
||||
await self._save_to_installed(unpinned)
|
||||
cognames = [inline(cog.name) for cog in unpinned]
|
||||
message += _("Unpinned cogs: ") + humanize_list(cognames)
|
||||
if len(unpinned) > 1:
|
||||
message += _("Unpinned cogs: ") + humanize_list(cognames)
|
||||
else:
|
||||
message += _("Unpinned {cog}").format(cognames[0])
|
||||
if not_pinned:
|
||||
message += _("\nThese cogs weren't pinned: ") + humanize_list(not_pinned)
|
||||
if len(unpinned) > 1:
|
||||
message += _("\nThese cogs weren't pinned: ") + humanize_list(not_pinned)
|
||||
else:
|
||||
message += _("\n{cog} was already not pinned.").format(cog=not_pinned[0])
|
||||
await self.send_pagified(ctx, message)
|
||||
|
||||
@cog.command(name="listpinned")
|
||||
@@ -903,14 +938,22 @@ class Downloader(commands.Cog):
|
||||
message = ""
|
||||
if cogs_to_update:
|
||||
cognames = [cog.name for cog in cogs_to_update]
|
||||
message += _("These cogs can be updated: ") + humanize_list(
|
||||
tuple(map(inline, cognames))
|
||||
)
|
||||
if len(cogs_to_update) > 1:
|
||||
message += _("These cogs can be updated: ") + humanize_list(
|
||||
tuple(map(inline, cognames))
|
||||
)
|
||||
else:
|
||||
message += _("{cog} can be updated.").format(cog=inline(cognames[0]))
|
||||
if libs_to_update:
|
||||
libnames = [cog.name for cog in libs_to_update]
|
||||
message += _("\nThese shared libraries can be updated: ") + humanize_list(
|
||||
tuple(map(inline, libnames))
|
||||
)
|
||||
if len(libnames) > 1:
|
||||
message += _("\nThese shared libraries can be updated: ") + humanize_list(
|
||||
tuple(map(inline, libnames))
|
||||
)
|
||||
else:
|
||||
message += _("\nShared library {library} can be updated.").format(
|
||||
library=inline(libnames[0])
|
||||
)
|
||||
if not (cogs_to_update or libs_to_update) and filter_message:
|
||||
message += _("No cogs can be updated.")
|
||||
message += filter_message
|
||||
@@ -1068,23 +1111,49 @@ class Downloader(commands.Cog):
|
||||
@cog.command(name="list", usage="<repo_name>")
|
||||
async def _cog_list(self, ctx: commands.Context, repo: Repo) -> None:
|
||||
"""List all available cogs from a single repo."""
|
||||
available_cogs = 0
|
||||
installed = await self.installed_cogs()
|
||||
installed_str = ""
|
||||
if installed:
|
||||
installed_str = _("Installed Cogs:\n") + "\n".join(
|
||||
[
|
||||
"- {}{}".format(i.name, ": {}".format(i.short) if i.short else "")
|
||||
for i in installed
|
||||
if i.repo_name == repo.name
|
||||
]
|
||||
installed_str = "\n".join(
|
||||
[
|
||||
"- {}{}".format(i.name, ": {}".format(i.short) if i.short else "")
|
||||
for i in installed
|
||||
if i.repo_name == repo.name
|
||||
]
|
||||
)
|
||||
if not installed_str:
|
||||
installed_str = _("No cogs installed.")
|
||||
elif len(installed) > 1:
|
||||
installed_str = (
|
||||
_("Installed Cogs: ({installed_number})\n").format(installed_number=len(installed))
|
||||
+ installed_str
|
||||
)
|
||||
cogs = _("Available Cogs:\n") + "\n".join(
|
||||
else:
|
||||
installed_str = (
|
||||
_("Installed Cog: ({installed_number})\n").format(installed_number=len(installed))
|
||||
+ installed_str
|
||||
)
|
||||
available_str = "\n".join(
|
||||
[
|
||||
"+ {}: {}".format(cog.name, cog.short or "")
|
||||
for cog in repo.available_cogs
|
||||
if not (cog.hidden or cog in installed)
|
||||
]
|
||||
)
|
||||
for cog in repo.available_cogs:
|
||||
if not (cog.hidden or cog in installed):
|
||||
available_cogs += 1
|
||||
if not available_str:
|
||||
cogs = _("No cogs available.")
|
||||
elif available_cogs > 1:
|
||||
cogs = (
|
||||
_("Available Cogs: ({available_number})\n").format(available_number=available_cogs)
|
||||
+ available_str
|
||||
)
|
||||
else:
|
||||
cogs = (
|
||||
_("Available Cog: ({available_number})\n").format(available_number=available_cogs)
|
||||
+ available_str
|
||||
)
|
||||
cogs = cogs + "\n\n" + installed_str
|
||||
for page in pagify(cogs, ["\n"], shorten_by=16):
|
||||
await ctx.send(box(page.lstrip(" "), lang="diff"))
|
||||
@@ -1172,17 +1241,30 @@ class Downloader(commands.Cog):
|
||||
message = ""
|
||||
|
||||
if unavailable_cogs:
|
||||
message += _("\nCouldn't find these cogs in {repo.name}: ").format(
|
||||
repo=repo
|
||||
) + humanize_list(unavailable_cogs)
|
||||
if len(unavailable_cogs) > 1:
|
||||
message += _("\nCouldn't find these cogs in {repo.name}: ").format(
|
||||
repo=repo
|
||||
) + humanize_list(unavailable_cogs)
|
||||
else:
|
||||
message += _("\nCouldn't find {cog} cog in {repo.name}").format(
|
||||
cog=unavailable_cogs[0], repo=repo
|
||||
)
|
||||
if already_installed:
|
||||
message += _("\nThese cogs were already installed: ") + humanize_list(
|
||||
already_installed
|
||||
)
|
||||
if len(already_installed) > 1:
|
||||
message += _("\nThese cogs were already installed: ") + humanize_list(
|
||||
already_installed
|
||||
)
|
||||
else:
|
||||
message += _("\n{cog} was already installed.").format(cog=already_installed[0])
|
||||
if name_already_used:
|
||||
message += _(
|
||||
"\nSome cogs with these names are already installed from different repos: "
|
||||
) + humanize_list(name_already_used)
|
||||
if len(name_already_used) > 1:
|
||||
message += _(
|
||||
"\nSome cogs with these names are already installed from different repos: "
|
||||
) + humanize_list(name_already_used)
|
||||
else:
|
||||
message += _(
|
||||
"Cog with name {cog} is already installed from a different repo."
|
||||
).format(cog=name_already_used[0])
|
||||
correct_cogs, add_to_message = self._filter_incorrect_cogs(cogs)
|
||||
if add_to_message:
|
||||
return correct_cogs, f"{message}{add_to_message}"
|
||||
@@ -1223,14 +1305,25 @@ class Downloader(commands.Cog):
|
||||
correct_cogs.append(cog)
|
||||
message = ""
|
||||
if outdated_python_version:
|
||||
message += _(
|
||||
"\nThese cogs require higher python version than you have: "
|
||||
) + humanize_list(outdated_python_version)
|
||||
if len(outdated_python_version) > 1:
|
||||
message += _(
|
||||
"\nThese cogs require higher python version than you have: "
|
||||
) + humanize_list(outdated_python_version)
|
||||
else:
|
||||
message += _("{cog} require higher python version than you have.").format(
|
||||
outdated_python_version[0]
|
||||
)
|
||||
if outdated_bot_version:
|
||||
message += _(
|
||||
"\nThese cogs require different Red version"
|
||||
" than you currently have ({current_version}): "
|
||||
).format(current_version=red_version_info) + humanize_list(outdated_bot_version)
|
||||
if len(outdated_bot_version) > 1:
|
||||
message += _(
|
||||
"\nThese cogs require different Red version"
|
||||
" than you currently have ({current_version}): "
|
||||
).format(current_version=red_version_info) + humanize_list(outdated_bot_version)
|
||||
else:
|
||||
message += _(
|
||||
"{cog} require different Red version than you currently "
|
||||
"have ({current_version})"
|
||||
).format(cog=outdated_bot_version, current_version=red_version_info)
|
||||
|
||||
return tuple(correct_cogs), message
|
||||
|
||||
@@ -1293,22 +1386,45 @@ class Downloader(commands.Cog):
|
||||
updated_cognames: Set[str] = set()
|
||||
if installed_cogs:
|
||||
updated_cognames = {cog.name for cog in installed_cogs}
|
||||
message += _("\nUpdated: ") + humanize_list(tuple(map(inline, updated_cognames)))
|
||||
if len(installed_cogs) > 1:
|
||||
message += _("\nUpdated: ") + humanize_list(tuple(map(inline, updated_cognames)))
|
||||
else:
|
||||
message += _("\n{cog} updated.").format(
|
||||
cog=humanize_list(tuple(map(inline, updated_cognames)))
|
||||
)
|
||||
if failed_cogs:
|
||||
cognames = [cog.name for cog in failed_cogs]
|
||||
message += _("\nFailed to update cogs: ") + humanize_list(tuple(map(inline, cognames)))
|
||||
if len(failed_cogs) > 1:
|
||||
message += _("\nFailed to update cogs: ") + humanize_list(
|
||||
tuple(map(inline, cognames))
|
||||
)
|
||||
else:
|
||||
message += _("\nFailed to update cog: ") + humanize_list(
|
||||
tuple(map(inline, cognames))
|
||||
)
|
||||
if not cogs_to_update:
|
||||
message = _("No cogs were updated.")
|
||||
if installed_libs:
|
||||
message += _(
|
||||
"\nSome shared libraries were updated, you should restart the bot "
|
||||
"to bring the changes into effect."
|
||||
)
|
||||
if len(installed_libs) > 1:
|
||||
message += _(
|
||||
"\nSome shared libraries were updated, you should restart the bot "
|
||||
"to bring the changes into effect."
|
||||
)
|
||||
else:
|
||||
message += _(
|
||||
"\nA shared library was updated, you should restart the "
|
||||
"bot to bring the changes into effect."
|
||||
)
|
||||
if failed_libs:
|
||||
libnames = [lib.name for lib in failed_libs]
|
||||
message += _("\nFailed to install shared libraries: ") + humanize_list(
|
||||
tuple(map(inline, libnames))
|
||||
)
|
||||
if len(failed_cogs) > 1:
|
||||
message += _("\nFailed to install shared libraries: ") + humanize_list(
|
||||
tuple(map(inline, libnames))
|
||||
)
|
||||
else:
|
||||
message += _("\nFailed to install shared library: ") + humanize_list(
|
||||
tuple(map(inline, libnames))
|
||||
)
|
||||
return (updated_cognames, message)
|
||||
|
||||
async def _ask_for_cog_reload(self, ctx: commands.Context, updated_cognames: Set[str]) -> None:
|
||||
@@ -1318,7 +1434,12 @@ class Downloader(commands.Cog):
|
||||
return
|
||||
|
||||
if not ctx.assume_yes:
|
||||
message = _("Would you like to reload the updated cogs?")
|
||||
if len(updated_cognames) > 1:
|
||||
message = _("Would you like to reload the updated cogs?")
|
||||
else:
|
||||
message = _("Would you like to reload {cog}?").format(
|
||||
cog=humanize_list(tuple(map(inline, updated_cognames)))
|
||||
)
|
||||
can_react = ctx.channel.permissions_for(ctx.me).add_reactions
|
||||
if not can_react:
|
||||
message += " (y/n)"
|
||||
|
||||
Reference in New Issue
Block a user