From 4aa94f1ca62aabf9d4ca83a91e4194b49d710daa Mon Sep 17 00:00:00 2001 From: yasir Date: Wed, 15 Feb 2023 14:06:46 +0700 Subject: [PATCH] Tes new genss and mediainfo --- misskaty/plugins/genssv2.py | 9 +++++++-- misskaty/plugins/mediainfov2.py | 12 +++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/misskaty/plugins/genssv2.py b/misskaty/plugins/genssv2.py index bd162597..9bc24443 100644 --- a/misskaty/plugins/genssv2.py +++ b/misskaty/plugins/genssv2.py @@ -16,7 +16,7 @@ from pyrogram.errors import MessageNotModified from requests_toolbelt import MultipartEncoder from misskaty import app -from misskaty.helper import SUPPORTED_URL_REGEX +from misskaty.helper import SUPPORTED_URL_REGEX, progress_for_pyrogram from misskaty.vars import COMMAND_HANDLER @@ -214,7 +214,12 @@ async def telegram_screenshot(client, message, frame_count): replymsg = await message.reply_text(f"Downloading partial video file....", quote=True) if int(size) <= 200000000: - await message.download(os.path.join(os.getcwd(), file_name)) + c_time = time.time() + await message.download( + os.path.join(os.getcwd(), file_name), + progress=progress_for_pyrogram, + progress_args=("Trying to download..", replymsg, c_time) + ) downloaded_percentage = 100 # (100% download) else: diff --git a/misskaty/plugins/mediainfov2.py b/misskaty/plugins/mediainfov2.py index 60dc1f4e..f55c5159 100644 --- a/misskaty/plugins/mediainfov2.py +++ b/misskaty/plugins/mediainfov2.py @@ -1,6 +1,7 @@ import json import os import re +import time import subprocess from urllib.parse import unquote @@ -10,7 +11,7 @@ from pyrogram import filters from misskaty import app from misskaty.helper import (SUPPORTED_URL_REGEX, get_readable_bitrate, get_readable_file_size, post_to_telegraph, - remove_N) + progress_for_pyrogram, remove_N) from misskaty.vars import COMMAND_HANDLER @@ -98,7 +99,12 @@ async def telegram_mediainfo(client, message): reply_msg = await message.reply_text("Generating Mediainfo, Please wait..", quote=True) if int(size) <= 50000000: - await message.download(os.path.join(os.getcwd(), filename)) + c_time = time.time() + await message.download( + os.path.join(os.getcwd(), filename), + progress=progress_for_pyrogram, + progress_args=("Trying to download..", reply_msg, c_time) + ) else: async for chunk in client.stream_media(message, limit=5): @@ -107,7 +113,7 @@ async def telegram_mediainfo(client, message): mediainfo = subprocess.check_output(['mediainfo', filename]).decode("utf-8") mediainfo_json = json.loads(subprocess.check_output(['mediainfo', filename, '--Output=JSON']).decode("utf-8")) - readable_size = get_readable_file_size()(size) + readable_size = get_readable_file_size(size) try: lines = mediainfo.splitlines()