From b1b10ba2469266a8af486df138f7f9286a758c44 Mon Sep 17 00:00:00 2001 From: Yasir Aris M Date: Wed, 27 Sep 2023 21:59:19 +0700 Subject: [PATCH] catch err --- misskaty/helper/ffmpeg_helper.py | 6 +----- misskaty/plugins/session_generator.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/misskaty/helper/ffmpeg_helper.py b/misskaty/helper/ffmpeg_helper.py index 5a4c88f9..8ff00c98 100644 --- a/misskaty/helper/ffmpeg_helper.py +++ b/misskaty/helper/ffmpeg_helper.py @@ -6,9 +6,6 @@ from pyrogram.errors import FloodWait from pyrogram.types import InputMediaPhoto from misskaty.plugins.dev import shell_exec -from logging import getLogger - -LOGGER = getLogger(__name__) def hhmmss(seconds): @@ -18,8 +15,7 @@ def hhmmss(seconds): async def take_ss(video_file): out_put_file_name = f"genss-{str(time.time())}.png" cmd = f"""vcsi "{video_file}" -t -w 1340 -g 4x4 --timestamp-font assets/DejaVuSans.ttf --metadata-font assets/DejaVuSans-Bold.ttf --template misskaty/helper/ssgen_template.html --quality 100 --end-delay-percent 20 --metadata-font-size 30 -o {out_put_file_name} --timestamp-font-size 20""" - r = await shell_exec(cmd) - LOGGER.info(r) + await shell_exec(cmd) return out_put_file_name if os.path.lexists(out_put_file_name) else None diff --git a/misskaty/plugins/session_generator.py b/misskaty/plugins/session_generator.py index 5bda94cc..77dabfbb 100644 --- a/misskaty/plugins/session_generator.py +++ b/misskaty/plugins/session_generator.py @@ -253,9 +253,15 @@ async def generate_session(bot, msg, telethon=False, is_bot: bool = False): reply_markup=InlineKeyboardMarkup(gen_button), ) elif telethon: - await client.start(bot_token=phone_number) + try: + await client.start(bot_token=phone_number) + except Exception as err: + return await msg.reply(err) else: - await client.sign_in_bot(phone_number) + try: + await client.sign_in_bot(phone_number) + except Exception as err: + return await msg.reply(err) if telethon: string_session = client.session.save() else: