Update order

redbot/core/core_commands.py

@@ -12,10 +12,12 @@ import os
 import re
 import sys
 import platform
+import psutil
 import getpass
 import pip
 import traceback
 from pathlib import Path
+from redbot.core import data_manager
 from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
 from redbot.core.commands import GuildConverter
 from string import ascii_letters, digits
@@ -25,7 +27,6 @@ import aiohttp
 import discord
 from babel import Locale as BabelLocale, UnknownLocaleError
 from redbot.core.data_manager import storage_type
-from redbot.core.utils.chat_formatting import box, pagify
 
 from . import (
     __version__,
@@ -3536,47 +3537,57 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
             )
             or "None"
         )
-        if await ctx.embed_requested():
+
-            e = discord.Embed(color=await ctx.embed_colour())
+        # Barrowed from serverinfo, probs make humanize_data?
-            e.title = "Debug Info for Red"
+        def _datasize(num: int):
-            e.add_field(name="Red version", value=redver, inline=True)
+            for unit in ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB"]:
-            e.add_field(name="Python version", value=pyver, inline=True)
+                if abs(num) < 1024.0:
-            e.add_field(name="Discord.py version", value=dpy_version, inline=True)
+                    return "{0:.1f}{1}".format(num, unit)
-            e.add_field(name="Pip version", value=pipver, inline=True)
+                num /= 1024.0
-            e.add_field(name="System arch", value=platform.machine(), inline=True)
+            return "{0:.1f}{1}".format(num, "YB")
-            e.add_field(name="User", value=user_who_ran, inline=True)
+
-            e.add_field(name="Storage type", value=driver, inline=True)
+        memory_ram = psutil.virtual_memory()
-            e.add_field(name="Disabled intents", value=disabled_intents, inline=True)
+        ram_string = "{}/{} ({}%)".format(
-            e.add_field(name="OS version", value=osver, inline=False)
+            _datasize(memory_ram.used),
-            e.add_field(
+            _datasize(memory_ram.total),
-                name="Python executable",
+            memory_ram.percent
-                value=escape(sys.executable, formatting=True),
-                inline=False,
         )
-            e.add_field(
+
-                name="Data path",
+        owners = []
-                value=escape(str(data_path), formatting=True),
+        for uid in self.bot.owner_ids:
-                inline=False,
+            try:
-            )
+                u = await self.bot.get_or_fetch_user(uid)
-            e.add_field(
+                owners.append("{} ({})".format(u.id, str(u)))
-                name="Metadata file",
+            except discord.HTTPException:
-                value=escape(str(config_file), formatting=True),
+                owners.append("{} (Unresolvable)".format(uid))
-                inline=False,
+        owners_string = ", ".join(owners) or "None"
-            )
+
-            await ctx.send(embed=e)
-        else:
         info = (
-                "Debug Info for Red\n\n"
+            "### Debug Info for Red:\n\n"
-                + "Red version: {}\n".format(redver)
+            + "## System Metadata:\n"
-                + "Python version: {}\n".format(pyver)
+            + "CPU Cores: {}\n".format(psutil.cpu_count())
-                + "Discord.py version: {}\n".format(dpy_version)
+            + "RAM: {}\n\n".format(ram_string)
-                + "Pip version: {}\n".format(pipver)
+
-                + "System arch: {}\n".format(platform.machine())
+            + "## OS Variables:\n"
-                + "User: {}\n".format(user_who_ran)
             + "OS version: {}\n".format(osver)
+            + "System arch: {}\n".format(platform.machine())
+            + "User: {}\n\n".format(user_who_ran)
+
+            + "Python executable: {}\n".format(sys.executable)
+            + "Python version: {}\n".format(pyver)
+            + "Pip version: {}\n\n".format(pipver)
+
+            + "Red version: {}\n".format(redver)
+            + "Discord.py version: {}\n\n".format(dpy_version)
+
+            + "Child processes:"
+            + ""
+
+            + "## Red variables:\n"
+            + "Instance name: {}\n".format(data_manager.instance_name)
+            + "Owner(s): {}\n".format(owners_string)
             + "Storage type: {}\n".format(driver)
             + "Disabled intents: {}\n".format(disabled_intents)
-                + "Python executable: {}\n".format(sys.executable)
             + "Data path: {}\n".format(data_path)
             + "Metadata file: {}\n".format(config_file)
         )