nex/college-bot-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Enable cancelling downloads
All checks were successful
Build and Publish Jimmy.2 / build_and_publish (push) Successful in 6s
Details

Browse source
This commit is contained in:
Nexus 2024-05-31 03:15:33 +01:00
parent 580c8927f9
commit 8a4136321c
Signed by: nex
GPG key ID: 0FA334385D0B689F
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/cogs/ytdl.py
View file

@ -263,8 +263,11 @@ class YTDLCog(commands.Cog):
await ctx.defer()
last_edit = time.time()
options = self.default_options.copy()
stop = asyncio.Event()
def _download_hook(_data: dict[str, typing.Any]):
if stop.set():
raise RuntimeError("Download cancelled.")
n = time.time()
_total = _data.get("total_bytes", _data.get("total_bytes_estimate")) or ctx.guild.filesize_limit
if _total:
@ -399,8 +402,17 @@ class YTDLCog(commands.Cog):
)
embed.set_footer(text="Downloading (step 2/10)")
embed.set_thumbnail(url=thumbnail_url)
class StopView(discord.ui.View):
@discord.ui.button(label="Cancel download", style=discord.ButtonStyle.danger)
async def _stop(self, button: discord.ui.Button, interaction: discord.Interaction):
stop.set()
await interaction.response.edit_message(view=None)
self.stop()
await ctx.edit(
embed=embed
embed=embed,
view=StopView(timeout=86400)
)
previous = await self.get_saved(webpage_url, chosen_format_id, snip or "*")
if previous:
@ -431,7 +443,20 @@ class YTDLCog(commands.Cog):
url=webpage_url,
),
delete_after=120,
view=None
)
except RuntimeError:
return await ctx.edit(
embed=discord.Embed(
title="Error",
description="Download was cancelled.",
colour=discord.Colour.red(),
url=webpage_url,
),
delete_after=120,
view=None
)
await ctx.edit(view=None)
try:
if audio_only is False:
file: Path = next(temp_dir.glob("*." + extracted_info["ext"]))