diff --git a/speedtest/speedtest.py b/speedtest/speedtest.py index bdfacda..96ad02d 100644 --- a/speedtest/speedtest.py +++ b/speedtest/speedtest.py @@ -5,6 +5,7 @@ # ____) | __/ (_| \__ \\ V V /| | | | | | | | | | | | __/ | # |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_| +import asyncio import json import subprocess @@ -33,21 +34,35 @@ class Speedtest(commands.Cog): ] return "\n".join(text) + async def run_speedtest(self) -> str | asyncio.Any: + process = await asyncio.create_subprocess_exec( + "speedtest", "-f json", "--accept-license", + stdout=subprocess.PIPE, + stderr=subprocess.PIPE + ) + stdout, stderr = await process.communicate() + if process.returncode != 0: + return stderr.decode("utf-8") + return json.loads(stdout.decode("utf-8")) + @commands.command() @commands.is_owner() - async def speedtest(self, ctx: commands.Context): + async def speedtest(self, ctx: commands.Context) -> None: """Run a speedtest.""" msg = await ctx.maybe_send_embed("Running speedtest...") - result = subprocess.run(["speedtest", "-f json", "--accept-license"], stdout=subprocess.PIPE) - r = json.loads(result.stdout.decode("utf-8")) - if await ctx.embed_requested(): - embed = discord.Embed(title="Speedtest Results", link=r["result"]["url"], color=await ctx.embed_color()) - embed.add_field(name="Bandwidth", value=f"{r['download']['bandwidth'] / 1_000_000:.2f} Mbps down, {r['upload']['bandwidth'] / 1_000_000:.2f} Mbps up") - embed.add_field(name="Ping", value=f"Base: {round(r['ping']['latency'])} ms \nDownload: {round(r['download']['latency']['igm'])} ms \nUpload: {round(r['upload']['latency']['igm'])} ms") - embed.set_image(url=r["result"]["image"] + ".png") - await msg.edit(embed=embed) - else: - await msg.edit(content=f"**Speedtest Results**\n" - f"**Bandwidth**: {r['download']['bandwidth'] / 1_000_000:.2f} Mbps down, {r['upload']['bandwidth'] / 1_000_000:.2f} Mbps up\n" - f"**Ping**: Base: {round(r['ping']['latency'])} ms, Download: {round(r['download']['latency']['igm'])} ms, Upload: {round(r['upload']['latency']['igm'])} ms\n" - f"**Results**: {r['result']['url']}") + async with ctx.typing(): + r = await self.run_speedtest() + if isinstance(r, str): + await msg.edit(content=f"An error occurred: {r}") + return + if await ctx.embed_requested(): + embed = discord.Embed(title="Speedtest Results", link=r["result"]["url"], color=await ctx.embed_color()) + embed.add_field(name="Bandwidth", value=f"{r['download']['bandwidth'] / 1_000_000:.2f} Mbps down, {r['upload']['bandwidth'] / 1_000_000:.2f} Mbps up") + embed.add_field(name="Ping", value=f"Base: {round(r['ping']['latency'])} ms \nDownload: {round(r['download']['latency']['igm'])} ms \nUpload: {round(r['upload']['latency']['igm'])} ms") + embed.set_image(url=r["result"]["image"] + ".png") + await msg.edit(embed=embed) + else: + await msg.edit(content=f"**Speedtest Results**\n" + f"**Bandwidth**: {r['download']['bandwidth'] / 1_000_000:.2f} Mbps down, {r['upload']['bandwidth'] / 1_000_000:.2f} Mbps up\n" + f"**Ping**: Base: {round(r['ping']['latency'])} ms, Download: {round(r['download']['latency']['igm'])} ms, Upload: {round(r['upload']['latency']['igm'])} ms\n" + f"**Results**: {r['result']['url']}")