yasirarism/MissKatyPyro
1
0
Fork 0
mirror of https://github.com/yasirarism/MissKatyPyro.git synced 2026-01-07 04:14:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIxx

Browse source
This commit is contained in:
yasir 2023-01-09 09:02:50 +07:00
parent 2602fe7689
commit 890a8ac9f0
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
misskaty/plugins/misc_tools.py
View file

@ -239,7 +239,7 @@ async def topho(client, message):
f"tostick_{message.from_user.id}.jpg", f"tostick_{message.from_user.id}.jpg",
) )
await message.reply_photo( await message.reply_photo(
photo=photo, caption="Sticker -> Image\n@{BOT_USERNAME}" photo=photo, caption=f"Sticker -> Image\n@{client.me.username}"
) )
os.remove(photo) os.remove(photo)

2
misskaty/plugins/scrapwebsite.py
View file

@ -101,7 +101,7 @@ async def zonafilm(_, msg):
[ [
InlineKeyboardButton( InlineKeyboardButton(
text="❌ Close", text="❌ Close",
callback_data=f"close#{message.from_user.id}", callback_data=f"close#{msg.from_user.id}",
) )
] ]
] ]

31
misskaty/plugins/sub_extractor.py
View file

@ -20,7 +20,18 @@ from misskaty.helper.pyro_progress import progress_for_pyrogram
LOGGER = getLogger(__name__) LOGGER = getLogger(__name__)
ARCH_EXT = [".mkv", ".avi", ".mp4", ".mov"] VIDEO_SUFFIXES = (
"mkv",
"mp4",
"mov",
"wmv",
"3gp",
"mpg",
"webm",
"avi",
"flv",
"m4v",
)
__MODULE__ = "MediaExtract" __MODULE__ = "MediaExtract"
__HELP__ = """ __HELP__ = """
@ -35,13 +46,13 @@ def get_base_name(orig_path: str):
return ngesplit(f"{ext}$", orig_path, maxsplit=1, flags=I)[0] return ngesplit(f"{ext}$", orig_path, maxsplit=1, flags=I)[0]
def get_subname(url, format): def get_subname(lang, url, format):
fragment_removed = url.split("#")[0] # keep to left of first # fragment_removed = url.split("#")[0] # keep to left of first #
query_string_removed = fragment_removed.split("?")[0] query_string_removed = fragment_removed.split("?")[0]
scheme_removed = query_string_removed.split("://")[-1].split(":")[-1] scheme_removed = query_string_removed.split("://")[-1].split(":")[-1]
if scheme_removed.find("/") == -1: if scheme_removed.find("/") == -1:
return f"MissKatySub_{get_random_string(4)}.{format}" return f"[{lang.upper()}] MissKatySub_{get_random_string(4)}.{format}"
return f"{get_base_name(os.path.basename(unquote(scheme_removed)))}.{format}" return f"[{lang.upper()}] {get_base_name(os.path.basename(unquote(scheme_removed)))}.{format}"
@app.on_message(filters.command(["ceksub", "extractmedia"], COMMAND_HANDLER)) @app.on_message(filters.command(["ceksub", "extractmedia"], COMMAND_HANDLER))
@ -79,7 +90,7 @@ async def ceksub(_, m):
[ [
InlineKeyboardButton( InlineKeyboardButton(
f"0:{mapping}({lang}): {stream_type}: {stream_name}", f"0:{mapping}({lang}): {stream_type}: {stream_name}",
f"streamextract#0:{mapping}#{stream_name}", f"streamextract#{lang}#0:{mapping}#{stream_name}",
) )
] ]
) )
@ -118,7 +129,7 @@ async def convertsrt(c, m):
LOGGER.info( LOGGER.info(
f"ConvertSub: {filename} by {m.from_user.first_name} [{m.from_user.id}]" f"ConvertSub: {filename} by {m.from_user.first_name} [{m.from_user.id}]"
) )
(await shell_exec(f"mediaextract -i '{dl}' '{filename}'.srt"))[0] (await shell_exec(f"mediaextract -i '{dl}' '{filename}.srt'"))[0]
c_time = time() c_time = time()
await m.reply_document( await m.reply_document(
f"{filename}.srt", f"{filename}.srt",
@ -140,7 +151,7 @@ async def stream_extract(bot, update):
usr = update.message.reply_to_message usr = update.message.reply_to_message
if update.from_user.id != usr.from_user.id: if update.from_user.id != usr.from_user.id:
return await update.answer("⚠️ Access Denied!", True) return await update.answer("⚠️ Access Denied!", True)
_, map, codec = cb_data.split("#") _, lang, map, codec = cb_data.split("#")
try: try:
link = update.message.reply_to_message.command[1] link = update.message.reply_to_message.command[1]
except: except:
@ -156,11 +167,13 @@ async def stream_extract(bot, update):
else: else:
format = "srt" format = "srt"
start_time = perf_counter() start_time = perf_counter()
namafile = get_subname(link, format) namafile = get_subname(lang, link, format)
LOGGER.info( LOGGER.info(
f"ExtractSub: {namafile} by {update.from_user.first_name} [{update.from_user.id}]" f"ExtractSub: {namafile} by {update.from_user.first_name} [{update.from_user.id}]"
) )
extract = (await shell_exec(f"mediaextract -i {link} -map {map} {namafile}"))[0] extract = (await shell_exec(f"mediaextract -i {link} -map {map} '{namafile}'"))[
0
]
end_time = perf_counter() end_time = perf_counter()
timelog = "{:.2f}".format(end_time - start_time) + " second" timelog = "{:.2f}".format(end_time - start_time) + " second"
c_time = time() c_time = time()