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

Fix preset resolutions
All checks were successful
Build and Publish Jimmy.2 / build_and_publish (push) Successful in 1m41s
Details

Browse source
This commit is contained in:
Nexus 2024-05-31 02:28:56 +01:00
parent 774e8cf3d7
commit 21959374f7
Signed by: nex
GPG key ID: 0FA334385D0B689F
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/cogs/ytdl.py
View file

@ -24,19 +24,19 @@ class YTDLCog(commands.Cog):
self.bot = bot self.bot = bot
self.log = logging.getLogger("jimmy.cogs.ytdl") self.log = logging.getLogger("jimmy.cogs.ytdl")
self.common_formats = { self.common_formats = {
"144p": "17", # mp4 (h264+aac) v "144p": "bv[width<=144]+ba[ext=webm]/bv[width<=144]+ba[ext=m4a]/bv[width<=144]+ba/b[width<=144]",
"240p": "bv[width==240]+ba[ext=webm]/bv[width==240]+ba[ext=m4a]/bv[width==240]+ba", "240p": "bv[width<=240]+ba[ext=webm]/bv[width<=240]+ba[ext=m4a]/bv[width<=240]+ba/b[width<=240]",
"360p": "18", "360p": "bv[width<=360]+ba[ext=webm]/bv[width<=360]+ba[ext=m4a]/bv[width<=360]+ba/b[width<=360]",
"480p": "bv[width==480]+ba[ext=webm]/bv[width==480]+ba[ext=m4a]/bv[width==480]+ba", "480p": "bv[width<=500]+ba[ext=webm]/bv[width<=500]+ba[ext=m4a]/bv[width<=500]+bab[width<=480]",
"720p": "22", "720p": "bv[width<=720]+ba[ext=webm]/bv[width<=720]+ba[ext=m4a]/bv[width<=720]+ba/b[width<=720]",
"1080p": "bv[width==1080]+ba[ext=webm]/bv[width==1080]+ba[ext=m4a]/bv[width==1080]+ba", "1080p": "bv[width<=1080]+ba[ext=webm]/bv[width<=1080]+ba[ext=m4a]/bv[width<=1080]+ba",
"1440p": "bv[width==1440]+ba[ext=webm]/bv[width==1440]+ba[ext=m4a]/bv[width==1440]+ba", "1440p": "bv[width<=1440]+ba[ext=webm]/bv[width<=1440]+ba[ext=m4a]/bv[width<=1440]+ba",
"2160p": "bv[width==2160]+ba[ext=webm]/bv[width==2160]+ba[ext=m4a]/bv[width==2160]+ba", "2160p": "bv[width<=2160]+ba[ext=webm]/bv[width<=2160]+ba[ext=m4a]/bv[width<=2160]+ba",
"mp3": "ba[filesize<25M]", "mp3": "ba[filesize<500M]",
"m4a": "ba[ext=m4a][filesize<25M]", "m4a": "ba[ext=m4a][filesize<500M]",
"opus": "ba[ext=webm][filesize<25M]", "opus": "ba[ext=webm][filesize<500M]",
"vorbis": "ba[ext=webm][filesize<25M]", "vorbis": "ba[ext=webm][filesize<500M]",
"ogg": "ba[ext=webm][filesize<25M]", "ogg": "ba[ext=webm][filesize<500M]",
} }
self.default_options = { self.default_options = {
"noplaylist": True, "noplaylist": True,
@ -44,7 +44,7 @@ class YTDLCog(commands.Cog):
"no_color": True, "no_color": True,
"noprogress": True, "noprogress": True,
"logger": self.log, "logger": self.log,
"format": "((bv+ba/b)[vcodec!=h265][vcodec!=av01][filesize<15M]/b[filesize<=15M]/b)", "format": "((bv+ba/b)[vcodec!=h265][filesize<500M]/b[filesize<=500M]/b)",
"outtmpl": "%(title).50s.%(ext)s", "outtmpl": "%(title).50s.%(ext)s",
"format_sort": [ "format_sort": [
"vcodec:h264", "vcodec:h264",
@ -517,7 +517,7 @@ class YTDLCog(commands.Cog):
url=webpage_url, url=webpage_url,
) )
try: try:
if size_bytes >= (20 * 1024 * 1024): if size_bytes >= (20 * 1024 * 1024) or vcodec.lower() in ["hevc", "h265", "av1", "av01"]:
with file.open("rb") as fb: with file.open("rb") as fb:
part = await self.upload_to_0x0( part = await self.upload_to_0x0(
file.name, file.name,