Update bot.py

bot.py

@@ -2,6 +2,7 @@ import os
 import re
 import time
 import io
+import asyncio
 from telethon import events, Button
 import db
 
@@ -46,10 +47,10 @@ async def generate_status_msg():
         f"`[{bar}]`\n"
         f"━━━━━━━━━━━━━━━━━━━\n"
         f"🔴 Taken    : `{counts['taken']:<10,}`\n"
-        f"🛒 Sold     : `{counts['sold']:<10,}`\n"
         f"🚫 Unavail  : `{counts['unavailable']:<10,}`\n"
         f"💰 For Sale : `{counts['forsale']:<10,}`\n"
         f"🔨 Auction  : `{counts['auction']:<10,}`\n"
+        f"🛒 Sold     : `{counts['sold']:<10,}`\n"
         f"━━━━━━━━━━━━━━━━━━━\n"
         f"⚡ Speed    : `{concurrency:<10}`\n"
         f"📋 Queue    : `{qlen:<10,}`\n"
@@ -60,23 +61,18 @@ def setup_handlers(client):
     @client.on(events.NewMessage(pattern='/start'))
     async def start_cmd(event):
         if not is_admin(event):
-            await event.respond("⛔ Unauthorized.")
             return
-        
         await event.respond("👋 **Fragment Scanner Bot**\nSelect an action below:", buttons=get_main_buttons())
 
     @client.on(events.NewMessage(pattern='/upload'))
     async def upload_cmd(event):
         if not is_admin(event):
-            await event.respond("⛔ Unauthorized.")
             return
-
         if not event.is_reply:
             await event.respond("⚠️ Please reply to a `.txt` file with `/upload`.")
             return
 
         reply_msg = await event.get_reply_message()
-
         if not reply_msg.document or reply_msg.file.ext != '.txt':
             await event.respond("⚠️ The message you replied to must be a `.txt` document.")
             return
@@ -88,17 +84,13 @@ def setup_handlers(client):
     @client.on(events.NewMessage(pattern='/load'))
     async def load_cmd(event):
         if not is_admin(event):
-            await event.respond("⛔ Unauthorized.")
             return
         await _load_words(event, is_callback=False)
 
     async def _load_words(event, is_callback=True):
         async def update_msg(text):
             if is_callback:
-                try:
-                    await event.edit(text, buttons=get_main_buttons())
-                except Exception:
-                    pass
+                await event.edit(text, buttons=get_main_buttons())
             else:
                 await event.respond(text, buttons=get_main_buttons())
 
@@ -113,21 +105,26 @@ def setup_handlers(client):
             await update_msg("⚠️ The `words.txt` file on the server is empty. You've processed everything! Upload a new file.")
             return
 
+        # Load chunks safely
         CHUNK_SIZE = 200000
         current_chunk = all_lines[:CHUNK_SIZE]
         remaining_lines = all_lines[CHUNK_SIZE:]
 
-        valid_words = [w for w in set(current_chunk) if re.match(r'^[a-z0-9_]{4,32}$', w)]
+        # OPTIMIZATION 1: Fast regex filtering
+        valid_words = {w for w in current_chunk if re.match(r'^[a-z0-9_]{4,32}$', w)}
         
         r = await db.get_redis()
         done = await r.smembers("frag:done")
         
-        to_queue = [w for w in valid_words if w not in done]
+        # OPTIMIZATION 2: Mathematical Set Subtraction (Instant calculation instead of freezing CPU)
+        to_queue = list(valid_words - done)
         
         if to_queue:
             pipe = r.pipeline()
             for i in range(0, len(to_queue), 1000):
                 pipe.lpush("frag:queue", *to_queue[i:i+1000])
+                # OPTIMIZATION 3: Yield to event loop so bot buttons stay smooth
+                await asyncio.sleep(0) 
             
             try:
                 await pipe.execute()
@@ -162,6 +159,7 @@ def setup_handlers(client):
                 pass
             return
 
+        # Instantly tell Telegram we received the click to stop the loading clock
         try:
             await event.answer()
         except Exception:
@@ -170,47 +168,30 @@ def setup_handlers(client):
         data = event.data.decode('utf-8')
 
         if data == "back_main":
-            try:
-                await event.edit("👋 **Fragment Scanner Bot**\nSelect an action below:", buttons=get_main_buttons())
-            except Exception:
-                pass
+            await event.edit("👋 **Fragment Scanner Bot**\nSelect an action below:", buttons=get_main_buttons())
 
         elif data == "load_words":
-            try:
-                await event.edit("⏳ Reading and loading words... Please wait.")
-            except Exception:
-                pass
+            # Immediate UI feedback
+            await event.edit("⏳ **Reading and loading words... Please wait.**")
             await _load_words(event, is_callback=True)
             
         elif data == "start_scan":
             await db.set_state(running="1", paused="0", start_time=str(time.time()))
             qlen = await db.queue_size()
-            try:
-                await event.edit(f"🚀 **Scan started!**\n`{qlen:,}` words currently in the processing queue.", buttons=get_main_buttons())
-            except Exception:
-                pass
+            await event.edit(f"🚀 **Scan started!**\n`{qlen:,}` words currently in the processing queue.", buttons=get_main_buttons())
             
         elif data == "pause_scan":
             state = await db.get_state()
             if state.get("paused") == "1":
                 await db.set_state(paused="0")
-                try:
-                    await event.edit("▶️ **Scan resumed.**", buttons=get_main_buttons())
-                except Exception:
-                    pass
+                await event.edit("▶️ **Scan resumed.**", buttons=get_main_buttons())
             else:
                 await db.set_state(paused="1")
-                try:
-                    await event.edit("⏸ **Scan paused.**", buttons=get_main_buttons())
-                except Exception:
-                    pass
+                await event.edit("⏸ **Scan paused.**", buttons=get_main_buttons())
                 
         elif data == "stop_scan":
             await db.set_state(running="0", paused="0")
-            try:
-                await event.edit("⏹ **Scan stopped.** Progress has been saved.", buttons=get_main_buttons())
-            except Exception:
-                pass
+            await event.edit("⏹ **Scan stopped.** Progress has been saved.", buttons=get_main_buttons())
             
         elif data in ("show_status", "refresh_status"):
             msg = await generate_status_msg()
@@ -221,7 +202,7 @@ def setup_handlers(client):
             try:
                 await event.edit(msg, buttons=buttons)
             except Exception:
-                pass
+                pass 
             
         elif data == "set_speed":
             buttons = [
@@ -229,10 +210,7 @@ def setup_handlers(client):
                 [Button.inline("🚀 50", b"spd_50"), Button.inline("⚡ 75", b"spd_75"), Button.inline("🔥 100", b"spd_100")],
                 [Button.inline("🔙 Cancel", b"back_main")]
             ]
-            try:
-                await event.edit("⚡ **Select Scanner Speed (Concurrent Workers):**", buttons=buttons)
-            except Exception:
-                pass
+            await event.edit("⚡ **Select Scanner Speed (Concurrent Workers):**", buttons=buttons)
             
         elif data.startswith("spd_"):
             try:
@@ -240,71 +218,54 @@ def setup_handlers(client):
                 await db.set_concurrency(speed_limit)
                 await event.edit(f"⚡ **Speed updated successfully!**\nNow running with `{speed_limit}` concurrent workers.", buttons=get_main_buttons())
             except Exception:
-                try:
-                    await event.edit("❌ Error setting speed.", buttons=get_main_buttons())
-                except Exception:
-                    pass
+                await event.edit("❌ Error setting speed.", buttons=get_main_buttons())
             
         elif data == "export_files":
-            try:
-                await event.edit("⏳ **Exporting data...**\nPlease wait while files are generated.", buttons=get_main_buttons())
-            except Exception:
-                pass
+            await event.edit("⏳ **Exporting data...**\nPlease wait while files are generated.")
             
             taken = sorted(await db.get_all_taken())
             unavail = sorted(await db.get_all_unavailable())
             sold = sorted(await db.get_all_sold())
             forsale = sorted(await db.get_all_forsale())
-            auction = sorted(await db.get_all_auction())
             
-            files_to_send = [
-                (taken, "taken.txt"),
-                (unavail, "unavailable.txt"),
-                (sold, "sold.txt"),
-                (forsale, "forsale.txt"),
-                (auction, "onauction.txt")
-            ]
+            await asyncio.sleep(0) # Keep UI smooth
             
-            sent_count = 0
-            for data_list, filename in files_to_send:
-                if data_list:
-                    f_io = io.BytesIO("\n".join(data_list).encode('utf-8'))
-                    f_io.name = filename
-                    await client.send_file(event.chat_id, file=f_io)
-                    sent_count += 1
+            exported_count = 0
             
-            try:
-                await event.edit(
-                    f"✅ **Export Complete!**\n"
-                    f"Generated {sent_count} files.\n\n"
-                    f"📊 **Stats:**\n"
-                    f"Taken: {len(taken):,}\n"
-                    f"Sold: {len(sold):,}\n"
-                    f"For Sale: {len(forsale):,}\n"
-                    f"Auction: {len(auction):,}\n"
-                    f"Unavailable: {len(unavail):,}", 
-                    buttons=get_main_buttons()
-                )
-            except Exception:
-                pass
+            if taken:
+                f_taken = io.BytesIO("\n".join(taken).encode('utf-8'))
+                f_taken.name = "taken.txt"
+                await client.send_file(event.chat_id, file=f_taken)
+                exported_count += 1
+                
+            if unavail:
+                f_unavail = io.BytesIO("\n".join(unavail).encode('utf-8'))
+                f_unavail.name = "unavailable.txt"
+                await client.send_file(event.chat_id, file=f_unavail)
+                exported_count += 1
+                
+            if sold:
+                f_sold = io.BytesIO("\n".join(sold).encode('utf-8'))
+                f_sold.name = "sold.txt"
+                await client.send_file(event.chat_id, file=f_sold)
+                exported_count += 1
+                
+            if forsale:
+                f_forsale = io.BytesIO("\n".join(forsale).encode('utf-8'))
+                f_forsale.name = "forsale.txt"
+                await client.send_file(event.chat_id, file=f_forsale)
+                exported_count += 1
+            
+            await event.edit(f"✅ **Export Complete!**\nGenerated `{exported_count}` text files.", buttons=get_main_buttons())
             
         elif data == "reset_confirm":
             buttons = [
                 [Button.inline("✅ Yes, WIPE ALL DATA", b"reset_do")],
                 [Button.inline("❌ Cancel", b"back_main")]
             ]
-            try:
-                await event.edit("⚠️ **DANGER ZONE** ⚠️\n\nAre you sure you want to completely wipe the Redis database? All progress will be lost.", buttons=buttons)
-            except Exception:
-                pass
+            await event.edit("⚠️ **DANGER ZONE** ⚠️\n\nAre you sure you want to completely wipe the Redis database? All progress will be lost.", buttons=buttons)
             
         elif data == "reset_do":
-            try:
-                await event.edit("⏳ **Wiping database...**")
-            except Exception:
-                pass
+            await event.edit("⏳ **Wiping database...**")
             await db.flush_all()
-            try:
-                await event.edit("💣 **Database wiped.**\n\nRedis is completely clear. Click **🔄 Load Words** to grab the next batch from the server disk!", buttons=get_main_buttons())
-            except Exception:
-                pass
+            await event.edit("💣 **Database wiped.**\n\nRedis is completely clear. Click **🔄 Load Words** to grab the next batch from the server disk!", buttons=get_main_buttons())