diff --git a/misskaty/plugins/download_upload.py b/misskaty/plugins/download_upload.py index cf3295d5..00c80e10 100644 --- a/misskaty/plugins/download_upload.py +++ b/misskaty/plugins/download_upload.py @@ -87,12 +87,12 @@ async def download(client, message): c_time = time.time() while not downloader.isFinished(): total_length = downloader.filesize or None - downloaded = downloader.get_dl_size() + downloaded = downloader.get_dl_size(human=True) display_message = "" now = time.time() diff = now - c_time percentage = downloader.get_progress() * 100 - speed = downloader.get_speed() + speed = downloader.get_speed(human=True) round(diff) * 1000 progress_str = "[{0}{1}]\nProgress: {2}%".format( "".join(["█" for _ in range(math.floor(percentage / 5))]), @@ -133,7 +133,7 @@ async def tiktokdl(client, message): try: r = (await http.get(f"https://api.hayo.my.id/api/tiktok/4?url={link}")).json() await message.reply_video( - r["linkori"], + r["linkhd"], caption=f"Title: {r['name']}\n\nUploaded for {message.from_user.mention} [{message.from_user.id}]", ) await msg.delete() diff --git a/misskaty/plugins/filter_request.py b/misskaty/plugins/filter_request.py index 7b721ab9..efc1693f 100644 --- a/misskaty/plugins/filter_request.py +++ b/misskaty/plugins/filter_request.py @@ -8,6 +8,7 @@ from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup from misskaty import app from .web_scraper import SCRAP_DICT, data_kuso +from .pypi_search import PYPI_DICT from misskaty.core.decorator.errors import capture_err from misskaty.helper.time_gap import check_time_gap @@ -105,10 +106,12 @@ async def request_user(client, message): pass +# To reduce cache async def clear_reqdict(): SCRAP_DICT.clear() data_kuso.clear() REQUEST_DB.clear() + PYPI_DICT.clear() # @app.on_message(filters.regex(r"makasi|thank|terimakasih|terima kasih|mksh", re.I) & filters.chat(chat)) diff --git a/misskaty/plugins/pypi_search.py b/misskaty/plugins/pypi_search.py new file mode 100644 index 00000000..acb73984 --- /dev/null +++ b/misskaty/plugins/pypi_search.py @@ -0,0 +1,110 @@ +""" + * @author yasir + * @date 2023-01-23 19:41:27 + * @lastModified 2023-01-23 19:41:31 + * @projectName MissKatyPyro + * Copyright @YasirPedia All rights reserved +""" +from pykeyboard import InlineButton, InlineKeyboard +from pyrogram import filters + +from misskaty import app +from misskaty.core.message_utils import * +from misskaty.helper.http import http +from misskaty.plugins.web_scraper import split_arr, headers +from misskaty.vars import COMMAND_HANDLER + +PYPI_DICT = {} + +async def getDataPypi(msg, kueri, CurrentPage, user): + if not PYPI_DICT.get(msg.id): + pypijson = (await http.get(f'https://yasirapi.eu.org/pypi?q={kueri}')).json() + if not pypijson.get("result"): + await editPesan(msg, "Sorry could not find any matching results!") + return None, 0, None + PYPI_DICT[msg.id] = [split_arr(pypijson["result"], 6), kueri] + try: + index = int(CurrentPage - 1) + PageLen = len(PYPI_DICT[msg.id][0]) + extractbtn = [] + pypiResult = f"#Pypi Results For: {kueri}\n\n" + for c, i in enumerate(PYPI_DICT[msg.id][0][index], start=1): + pypiResult += f"{c}. {i['name']}\nCreated: {i['created']}\nDesc: {i['description']}\n\n" + extractbtn.append( + InlineButton(c, f"pypidata#{CurrentPage}#{c}#{user}#{msg.id}") + ) + IGNORE_CHAR = "[]" + pypiResult = ''.join(i for i in pypiResult if not i in IGNORE_CHAR) + return pypiResult, PageLen, extractbtn + except (IndexError, KeyError): + await editPesan(msg, "Sorry could not find any matching results!") + return None, 0, None + +@app.on_message(filters.command(['pypi'], COMMAND_HANDLER)) +async def pypi_s(client, message): + kueri = ' '.join(message.command[1:]) + if not kueri: + return await kirimPesan(message, "Please add query after command. Ex: /pypi pyrogram") + pesan = await kirimPesan(message, "âŗ Please wait, getting data from pypi..", quote=True) + CurrentPage = 1 + pypires, PageLen, btn = await getDataPypi(pesan, kueri, CurrentPage, message.from_user.id) + if not pypires: return + keyboard = InlineKeyboard() + keyboard.paginate(PageLen, CurrentPage, 'page_pypi#{number}' + f'#{pesan.id}#{message.from_user.id}') + keyboard.row(InlineButton("👇 Get Info ", "Hmmm")) + keyboard.row(*btn) + keyboard.row( + InlineButton("❌ Close", f"close#{message.from_user.id}") + ) + await editPesan(pesan, pypires, reply_markup=keyboard) + +@app.on_callback_query(filters.create(lambda _, __, query: 'page_pypi#' in query.data)) +async def pypipage_callback(client, callback_query): + if callback_query.from_user.id != int(callback_query.data.split('#')[3]): + return await callback_query.answer("Not yours..", True) + message_id = int(callback_query.data.split('#')[2]) + CurrentPage = int(callback_query.data.split('#')[1]) + try: + kueri = PYPI_DICT[message_id][1] + except KeyError: + return await callback_query.answer("Invalid callback data, please send CMD again..") + + try: + pypires, PageLen, btn = await getDataPypi(callback_query.message, kueri, CurrentPage, callback_query.from_user.id) + except TypeError: + return + + keyboard = InlineKeyboard() + keyboard.paginate(PageLen, CurrentPage, 'page_pypi#{number}' + f'#{message_id}#{callback_query.from_user.id}') + keyboard.row(InlineButton("👇 Extract Data ", "Hmmm")) + keyboard.row(*btn) + keyboard.row( + InlineButton("❌ Close", f"close#{callback_query.from_user.id}") + ) + await editPesan(callback_query.message, pypires, reply_markup=keyboard) + +@app.on_callback_query(filters.create(lambda _, __, query: 'pypidata#' in query.data)) +async def pypi_getdata(_, callback_query): + if callback_query.from_user.id != int(callback_query.data.split('#')[3]): + return await callback_query.answer("Not yours..", True) + idlink = int(callback_query.data.split("#")[2]) + message_id = int(callback_query.data.split('#')[4]) + CurrentPage = int(callback_query.data.split('#')[1]) + try: + pkgname = PYPI_DICT[message_id][0][CurrentPage-1][idlink-1].get("name") + except KeyError: + return await callback_query.answer("Invalid callback data, please send CMD again..") + + keyboard = InlineKeyboard() + keyboard.row( + InlineButton("↩ī¸ Back", f"page_pypi#{CurrentPage}#{message_id}#{callback_query.from_user.id}"), + InlineButton("❌ Close", f"close#{callback_query.from_user.id}") + ) + try: + html = await http.get(f"https://pypi.org/pypi/{pkgname}/json", headers=headers) + res = html.json() + msg = res["info"]["keywords"] + except Exception as err: + await editPesan(callback_query.message, f"ERROR: {err}", reply_markup=keyboard) + return + await editPesan(callback_query.message, res, reply_markup=keyboard)