From ecb35ae1978a536418711a6e64910aab90dac173 Mon Sep 17 00:00:00 2001 From: yasir Date: Sun, 8 Jan 2023 20:54:33 +0700 Subject: [PATCH] Add progress upload --- misskaty/plugins/mediainfo.py | 4 +--- misskaty/plugins/sub_extractor.py | 9 ++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/misskaty/plugins/mediainfo.py b/misskaty/plugins/mediainfo.py index f856b602..0e944b9d 100644 --- a/misskaty/plugins/mediainfo.py +++ b/misskaty/plugins/mediainfo.py @@ -17,9 +17,7 @@ from misskaty.vars import COMMAND_HANDLER from utils import get_file_id from misskaty import app from misskaty.helper.media_helper import post_to_telegraph, runcmd -from misskaty.helper.pyro_progress import ( - progress_for_pyrogram, -) +from misskaty.helper.pyro_progress import progress_for_pyrogram @app.on_message(filters.command(["mediainfo"], COMMAND_HANDLER)) diff --git a/misskaty/plugins/sub_extractor.py b/misskaty/plugins/sub_extractor.py index ba860827..59871878 100644 --- a/misskaty/plugins/sub_extractor.py +++ b/misskaty/plugins/sub_extractor.py @@ -12,10 +12,11 @@ from misskaty.vars import COMMAND_HANDLER from misskaty.core.decorator.errors import capture_err from misskaty.plugins.dev import shell_exec import json, os, traceback -from time import perf_counter +from time import perf_counter, time from re import split as ngesplit, I from urllib.parse import unquote from misskaty.helper.tools import get_random_string +from misskaty.helper.pyro_progress import progress_for_pyrogram LOGGER = getLogger(__name__) @@ -118,9 +119,12 @@ async def convertsrt(c, m): f"ConvertSub: {filename} by {m.from_user.first_name} [{m.from_user.id}]" ) (await shell_exec(f"mediaextract -i '{dl}' '{filename}'.srt"))[0] + c_time = time() await m.reply_document( f"{filename}.srt", caption=f"{filename}.srt\n\nConverted by @{c.me.username}", + progress=progress_for_pyrogram, + progress_args=("Uploading files..", process, c_time), ) await msg.delete() try: @@ -159,10 +163,13 @@ async def stream_extract(bot, update): extract = (await shell_exec(f"mediaextract -i {link} -map {map} {namafile}"))[0] end_time = perf_counter() timelog = "{:.2f}".format(end_time - start_time) + " second" + c_time = time() await update.message.reply_document( namafile, caption=f"Filename: {namafile}\n\nExtracted by @{bot.me.username} in {timelog}", reply_to_message_id=usr.id, + progress=progress_for_pyrogram, + progress_args=("Uploading files..", process, c_time), ) await update.message.delete() try: