mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-12-05 17:02:32 -05:00
Various improvements in usage of Rich in Red (#4726)
* Use Rich's default console object instead of making one * Bump Rich to version 9.8.2 * Disable indent guides in tracebacks * Skip empty lines between stack levels in traceback rendering * Use full width of the terminal when printing tracebacks * Disabling syntax highlighting on the log messages * Make logger name bold * Make logger level bold * Make URLs in console bold * Change `bright_blue` and `blue` colors in syntax theme (NEEDS CHANGING) * Show only one line per stack level in tracebacks * Shuffle things in `redbot.logging` a bit * Change logging handler while redirecting stdout in Dev cog * Revert last two commits... This reverts commit cf563bd06a6ae398da12713ceef3db9cc903d902. This reverts commit 6dddf300726ddf89b8924441eed59b67b58faca0. * Change Rich console to always print to sys.stdout (therefore ignoring stdout redirects) * Pass cli_flags to init_logging() * Add a flag to set the amount of extra lines in rich tracebacks * First take on the syntax theme colors * Use the Windows trick * ARE YOU SERIOUS!? * Remove dead code * Use Monokai when Terminal application supports truecolor * Syntax theme update * Change logger name color * This is not needed * Adjust logging level colors * Add a flag for showing local variables in Rich tracebacks * change imports a bit * Remove usage of blue color fully * Stop highlighting in Red-DiscordBot splash * Fix unreadable paths in tracebacks * Make CRITICAL logging level more readable * Make time in logs more readable * Fix the first row being bolded in tables * Update rich to 9.9.0
This commit is contained in:
jack1142
GitHub
@@ -10,7 +10,6 @@ from datetime import datetime, timedelta
|
||||
import aiohttp
|
||||
import discord
|
||||
import pkg_resources
|
||||
from colorama import Fore, Style, init
|
||||
from pkg_resources import DistributionNotFound
|
||||
from redbot.core import data_manager
|
||||
|
||||
@@ -33,15 +32,16 @@ from .utils._internal_utils import (
|
||||
)
|
||||
from .utils.chat_formatting import inline, bordered, format_perms_list, humanize_timedelta
|
||||
|
||||
import rich
|
||||
from rich import box
|
||||
from rich.table import Table
|
||||
from rich.columns import Columns
|
||||
from rich.panel import Panel
|
||||
from rich.text import Text
|
||||
|
||||
log = logging.getLogger("red")
|
||||
init()
|
||||
|
||||
INTRO = r"""[red]
|
||||
INTRO = r"""
|
||||
______ _ ______ _ _ ______ _
|
||||
| ___ \ | | | _ (_) | | | ___ \ | |
|
||||
| |_/ /___ __| | ______ | | | |_ ___ ___ ___ _ __ __| | | |_/ / ___ | |_
|
||||
@@ -88,14 +88,14 @@ def init_events(bot, cli_flags):
|
||||
red_pkg = pkg_resources.get_distribution("Red-DiscordBot")
|
||||
dpy_version = discord.__version__
|
||||
|
||||
table_general_info = Table(show_edge=False, show_header=False)
|
||||
table_general_info = Table(show_edge=False, show_header=False, box=box.MINIMAL)
|
||||
table_general_info.add_row("Prefixes", ", ".join(prefixes))
|
||||
table_general_info.add_row("Language", lang)
|
||||
table_general_info.add_row("Red version", red_version)
|
||||
table_general_info.add_row("Discord.py version", dpy_version)
|
||||
table_general_info.add_row("Storage type", data_manager.storage_type())
|
||||
|
||||
table_counts = Table(show_edge=False, show_header=False)
|
||||
table_counts = Table(show_edge=False, show_header=False, box=box.MINIMAL)
|
||||
# String conversion is needed as Rich doesn't deal with ints
|
||||
table_counts.add_row("Shards", str(bot.shard_count))
|
||||
table_counts.add_row("Servers", str(guilds))
|
||||
@@ -114,8 +114,8 @@ def init_events(bot, cli_flags):
|
||||
).format(pypi_version, red_version)
|
||||
rich_outdated_message = (
|
||||
f"[red]Outdated version![/red]\n"
|
||||
f"[red]!!![/red]Version {pypi_version} is available, "
|
||||
f"but you're using {red_version}[red]!!![/red]"
|
||||
f"[red]!!![/red]Version [cyan]{pypi_version}[/] is available, "
|
||||
f"but you're using [cyan]{red_version}[/][red]!!![/red]"
|
||||
)
|
||||
current_python = platform.python_version()
|
||||
extra_update = _(
|
||||
@@ -167,9 +167,10 @@ def init_events(bot, cli_flags):
|
||||
).format(py_version=current_python, req_py=py_version_req)
|
||||
outdated_red_message += extra_update
|
||||
|
||||
bot._rich_console.print(INTRO)
|
||||
rich_console = rich.get_console()
|
||||
rich_console.print(INTRO, style="red", markup=False, highlight=False)
|
||||
if guilds:
|
||||
bot._rich_console.print(
|
||||
rich_console.print(
|
||||
Columns(
|
||||
[Panel(table_general_info, title=str(bot.user.name)), Panel(table_counts)],
|
||||
equal=True,
|
||||
@@ -177,23 +178,21 @@ def init_events(bot, cli_flags):
|
||||
)
|
||||
)
|
||||
else:
|
||||
bot._rich_console.print(Columns([Panel(table_general_info, title=str(bot.user.name))]))
|
||||
rich_console.print(Columns([Panel(table_general_info, title=str(bot.user.name))]))
|
||||
|
||||
bot._rich_console.print(
|
||||
rich_console.print(
|
||||
"Loaded {} cogs with {} commands".format(len(bot.cogs), len(bot.commands))
|
||||
)
|
||||
|
||||
if invite_url:
|
||||
bot._rich_console.print(
|
||||
f"\nInvite URL: {Text(invite_url, style=f'link {invite_url}')}"
|
||||
)
|
||||
rich_console.print(f"\nInvite URL: {Text(invite_url, style=f'link {invite_url}')}")
|
||||
# We generally shouldn't care if the client supports it or not as Rich deals with it.
|
||||
if not guilds:
|
||||
bot._rich_console.print(
|
||||
rich_console.print(
|
||||
f"Looking for a quick guide on setting up Red? Checkout {Text('https://start.discord.red', style='link https://start.discord.red}')}"
|
||||
)
|
||||
if rich_outdated_message:
|
||||
bot._rich_console.print(rich_outdated_message)
|
||||
rich_console.print(rich_outdated_message)
|
||||
|
||||
if not bot.owner_ids:
|
||||
# we could possibly exit here in future
|
||||
@@ -404,37 +403,3 @@ def init_events(bot, cli_flags):
|
||||
uuid = c.unique_identifier
|
||||
group_data = c.custom_groups
|
||||
await bot._config.custom("CUSTOM_GROUPS", c.cog_name, uuid).set(group_data)
|
||||
|
||||
|
||||
def _get_startup_screen_specs():
|
||||
"""Get specs for displaying the startup screen on stdout.
|
||||
|
||||
This is so we don't get encoding errors when trying to print unicode
|
||||
emojis to stdout (particularly with Windows Command Prompt).
|
||||
|
||||
Returns
|
||||
-------
|
||||
`tuple`
|
||||
Tuple in the form (`str`, `str`, `bool`) containing (in order) the
|
||||
on symbol, off symbol and whether or not the border should be pure ascii.
|
||||
|
||||
"""
|
||||
encoder = codecs.getencoder(sys.stdout.encoding)
|
||||
check_mark = "\N{SQUARE ROOT}"
|
||||
try:
|
||||
encoder(check_mark)
|
||||
except UnicodeEncodeError:
|
||||
on_symbol = "[X]"
|
||||
off_symbol = "[ ]"
|
||||
else:
|
||||
on_symbol = check_mark
|
||||
off_symbol = "X"
|
||||
|
||||
try:
|
||||
encoder("┌┐└┘─│") # border symbols
|
||||
except UnicodeEncodeError:
|
||||
ascii_border = True
|
||||
else:
|
||||
ascii_border = False
|
||||
|
||||
return on_symbol, off_symbol, ascii_border
|
||||
|
||||
Reference in New Issue
Block a user