remove logging and breaking if search results < 5

program/ytsearch.py

@@ -1,50 +1,31 @@
-import logging
 from config import BOT_USERNAME
-from driver.filters import command, other_filters
+from driver.filters import command
 from pyrogram import Client
-from pyrogram.types import (
-    InlineKeyboardButton,
-    InlineKeyboardMarkup,
-    Message,
-)
+from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
 from youtube_search import YoutubeSearch
 
-logging.basicConfig(
-    level=logging.DEBUG,
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-logger = logging.getLogger(__name__)
-logging.getLogger("pyrogram").setLevel(logging.WARNING)
-
 
 @Client.on_message(command(["search", f"search@{BOT_USERNAME}"]))
 async def ytsearch(_, message: Message):
-
-    keyboard = InlineKeyboardMarkup(
-        [
-            [
-                InlineKeyboardButton(
-                    "🗑 Close", callback_data="cls",
-                )
-            ]
-        ]
-    )
-
-    try:
-        if len(message.command) < 2:
-            await message.reply_text("/search **needs an argument !**")
-            return
-        query = message.text.split(None, 1)[1]
-        m = await message.reply_text("🔎 **Searching...**")
-        results = YoutubeSearch(query, max_results=5).to_dict()
-        i = 0
-        text = ""
-        while i < 5:
+    if len(message.command) < 2:
+        return await message.reply_text("/search **needs an argument !**")
+    query = message.text.split(None, 1)[1]
+    m = await message.reply_text("🔎 **Searching...**")
+    results = YoutubeSearch(query, max_results=5).to_dict()
+    text = ""
+    for i in range(5):
+        try:
             text += f"🏷 **Name:** __{results[i]['title']}__\n"
             text += f"⏱ **Duration:** `{results[i]['duration']}`\n"
             text += f"👀 **Views:** `{results[i]['views']}`\n"
             text += f"📣 **Channel:** {results[i]['channel']}\n"
             text += f"🔗: https://www.youtube.com{results[i]['url_suffix']}\n\n"
-            i += 1
-        await m.edit(text, reply_markup=keyboard, disable_web_page_preview=True)
-    except Exception as e:
-        await m.edit(str(e))
+        except IndexError:
+            break
+    await m.edit_text(
+        text,
+        disable_web_page_preview=True,
+        reply_markup=InlineKeyboardMarkup(
+            [[InlineKeyboardButton("🗑 Close", callback_data="cls")]]
+        ),
+    )