From 5875b78285d9846f977df553c2cf0256750a4d77 Mon Sep 17 00:00:00 2001 From: yasir Date: Sat, 10 Dec 2022 14:18:06 +0700 Subject: [PATCH] Stable YTDL --- misskaty/plugins/ytdl_download_new.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/misskaty/plugins/ytdl_download_new.py b/misskaty/plugins/ytdl_download_new.py index b0d485e9..5de7a443 100644 --- a/misskaty/plugins/ytdl_download_new.py +++ b/misskaty/plugins/ytdl_download_new.py @@ -82,8 +82,26 @@ async def ytdl_gendl_callback(_, cq: CallbackQuery): callback = cq.data.split("|") key = callback[1] if callback[0] == "yt_gen": - x = await main.Extractor().get_download_button(key) - await cq.edit_message_caption(caption=x.caption, reply_markup=x.buttons) + if match := regex.match(query): + x = await main.Extractor().get_download_button(key) + await cq.edit_message_caption(caption=x.caption, reply_markup=x.buttons) + else: + uid = callback[2] + type_ = callback[3] + if type_ == "a": + format_ = "audio" + else: + format_ = "video" + async with iYTDL( + log_group_id=LOG_CHANNEL, + cache_path="cache", + ffmpeg_location="/usr/bin/mediaextract", + delete_media=True, + ) as ytdl: + upload_key = await ytdl.download( + "https://www.youtube.com/watch?v=" + key, uid, format_, cq, True, 3 + ) + await ytdl.upload(app, upload_key, format_, cq, True) else: uid = callback[2] type_ = callback[3] @@ -98,7 +116,7 @@ async def ytdl_gendl_callback(_, cq: CallbackQuery): delete_media=True, ) as ytdl: upload_key = await ytdl.download( - "https://www.youtube.com/watch?v="+key, uid, format_, cq, True, 3 + "https://www.youtube.com/watch?v=" + key, uid, format_, cq, True, 3 ) await ytdl.upload(app, upload_key, format_, cq, True)