Update bot.py

bot.py

@@ -4,8 +4,7 @@ import logging
 import os
 import re
 import uuid
-import time
-from typing import Dict
+from typing import List, Dict
 
 from aiogram import Bot, Dispatcher, types, F
 from aiogram.filters import CommandStart
@@ -19,6 +18,7 @@ import terabox_utils as terabox
 import db_utils
 
 # --- Setup ---
+
 os.makedirs("logs", exist_ok=True)
 os.makedirs("downloads", exist_ok=True)
 
@@ -43,13 +43,8 @@ bot = Bot(
 dp = Dispatcher()
 TASK_QUEUE = asyncio.Queue()
 BATCH_JOBS: Dict[str, Dict] = {}
-START_TIME = time.time()
-
-# --- Utils ---
-def get_uptime():
-    return round(time.time() - START_TIME)
 
-# --- Worker ---
+# --- Worker & Batch Logic ---
 async def link_processor_worker(worker_id: int):
     logger.info(f"Link worker #{worker_id} started.")
     while True:
@@ -62,7 +57,7 @@ async def link_processor_worker(worker_id: int):
             continue
 
         file_info = None
-        error_msg = f"Unknown error for link: {original_link}"
+        error_msg = f"An unknown error occurred for link: {original_link}"
 
         try:
             short_id = await terabox.extract_terabox_short_id(original_link)
@@ -71,8 +66,8 @@ async def link_processor_worker(worker_id: int):
 
             cached_file = await db_utils.get_cached_file(short_id)
             if cached_file:
-                logger.info(f"Cache hit for {short_id}.")
-                file_info = {'cached': True, **cached_file}
+                logger.info(f"Cache hit for {short_id}. Reusing file_id.")
+                file_info = {'cached': True, **cached_file, 'short_id': short_id}
             else:
                 download_url, raw_filename, error = await terabox.get_final_url_and_filename(original_link)
                 if error:
@@ -107,50 +102,36 @@ async def link_processor_worker(worker_id: int):
             else:
                 batch_info["failed_links"].append({"link": original_link, "error": error_msg})
 
-            processed = batch_info['processed_links']
-            total = batch_info['total_links']
-            eta = estimate_eta(batch_info)
-
+            processed, total = batch_info['processed_links'], batch_info['total_links']
             try:
                 await batch_info["status_message"].edit_text(
-                    f"⚙️ Batch `{batch_id[:6]}` processing... {processed}/{total} links.\nETA: {eta}s"
+                    f"<b>⚙️ Batch <code>{batch_id[:6]}</code> in progress...</b>\n"
+                    f"Processed: <b>{processed}/{total}</b>\n"
+                    f"✅ Success: <b>{len(batch_info['successful_downloads'])}</b>\n"
+                    f"❌ Failed: <b>{len(batch_info['failed_links'])}</b>"
                 )
             except TelegramBadRequest:
                 pass
 
             if processed == total:
-                logger.info(f"Batch {batch_id[:6]} complete.")
+                logger.info(f"Batch {batch_id[:6]} complete. Triggering final processing.")
                 await handle_batch_completion(batch_id)
 
         TASK_QUEUE.task_done()
 
-# --- ETA ---
-def estimate_eta(batch_info):
-    elapsed = time.time() - batch_info["start_time"]
-    processed = batch_info["processed_links"]
-    total = batch_info["total_links"]
-
-    if processed == 0:
-        return "calculating..."
-
-    avg_time_per_link = elapsed / processed
-    remaining_links = total - processed
-    eta = int(avg_time_per_link * remaining_links)
-    return eta
-
-# --- Send file ---
 async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Message:
     file_path_or_id = file_info.get('file_id') or FSInputFile(file_info['path'], filename=file_info['name'])
+    media_type = file_info.get('type')
     filename = file_info.get('name') or file_info.get('filename')
-    sent_message = None
 
     video_exts = ('.mp4', '.mkv', '.mov', '.avi', '.webm')
     audio_exts = ('.mp3', '.flac', '.ogg', '.wav')
 
-    if filename.lower().endswith(video_exts):
+    sent_message = None
+    if media_type == 'video' or filename.lower().endswith(video_exts):
         sent_message = await bot.send_video(chat_id, file_path_or_id, caption=caption, supports_streaming=True)
         media_type = 'video'
-    elif filename.lower().endswith(audio_exts):
+    elif media_type == 'audio' or filename.lower().endswith(audio_exts):
         sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption)
         media_type = 'audio'
     else:
@@ -165,7 +146,6 @@ async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Me
 
     return sent_message
 
-# --- Batch complete ---
 async def handle_batch_completion(batch_id: str):
     batch = BATCH_JOBS.get(batch_id)
     if not batch:
@@ -180,12 +160,12 @@ async def handle_batch_completion(batch_id: str):
                 [f"- {x['link']} → {x['error']}" for x in batch['failed_links']]
             )
             await status_msg.edit_text(
-                f"❌ Batch `{batch_id[:6]}` failed. No files processed.\nDetails:\n{failed_links_text}"
+                f"❌ Batch <code>{batch_id[:6]}</code> failed. No files could be processed.\n\nDetails:\n{failed_links_text}"
             )
             return
 
         await status_msg.edit_text(
-            f"✅ Batch `{batch_id[:6]}` downloaded. Sending {len(successful_downloads)} files..."
+            f"✅ Batch <code>{batch_id[:6]}</code> downloaded. Sending <b>{len(successful_downloads)}</b> files..."
         )
 
         if config.FORWARD_CHANNEL_ID:
@@ -195,24 +175,23 @@ async def handle_batch_completion(batch_id: str):
                 batch["source_message_id"]
             )
             for item in successful_downloads:
-                caption = f"`{item.get('name') or item.get('filename')}`"
+                caption = f"<code>{item.get('name') or item.get('filename')}</code>"
                 await send_and_cache_file(config.FORWARD_CHANNEL_ID, item, caption)
                 await asyncio.sleep(1)
 
         for item in successful_downloads:
-            caption = f"`{item.get('name') or item.get('filename')}`"
+            caption = f"<code>{item.get('name') or item.get('filename')}</code>"
             await send_and_cache_file(batch["source_chat_id"], item, caption)
 
-        summary = f"✅ Batch `{batch_id[:6]}` complete: {len(successful_downloads)} files sent."
-        if batch["failed_links"]:
-            summary += f"\n❌ {len(batch['failed_links'])} links failed."
-
+        summary = f"✅ Batch <code>{batch_id[:6]}</code> complete.\n\n" \
+                  f"📁 Files sent: <b>{len(successful_downloads)}</b>\n" \
+                  f"❌ Failed: <b>{len(batch['failed_links'])}</b>"
         await status_msg.edit_text(summary)
 
     except Exception as e:
-        logger.error(f"Error in batch {batch_id}: {e}", exc_info=True)
+        logger.error(f"Error during batch completion for {batch_id}: {e}", exc_info=True)
         await status_msg.edit_text(
-            f"A critical error occurred while sending files for batch `{batch_id[:6]}`."
+            f"A critical error occurred while sending files for batch <code>{batch_id[:6]}</code>."
         )
     finally:
         for item in successful_downloads:
@@ -223,7 +202,6 @@ async def handle_batch_completion(batch_id: str):
 
         del BATCH_JOBS[batch_id]
 
-# --- Message ---
 @dp.message(F.text | F.caption)
 async def message_handler(message: Message):
     if message.text and message.text.startswith('/'):
@@ -236,15 +214,20 @@ async def message_handler(message: Message):
     )
 
     links = list(set(re.findall(r'https?://[^\s<>"\']+', message.text or message.caption or "")))
-    terabox_links = [link for link in links if any(domain in link for domain in [
-        "terabox.com", "teraboxapp.com", "terasharelink.com", "1024tera.com", "freeterabox.com", "4funbox.com", "box-links.com"
-    ])]
+    terabox_links = [
+        link for link in links if any(domain in link for domain in [
+            "terabox.com", "teraboxapp.com", "terasharelink.com", "1024tera.com",
+            "freeterabox.com", "4funbox.com", "box-links.com"
+        ])
+    ]
 
     if not terabox_links:
         return
 
     batch_id = str(uuid.uuid4())
-    status_msg = await message.reply(f"✅ Found {len(terabox_links)} links. Queued as batch `{batch_id[:6]}`.")
+    status_msg = await message.reply(
+        f"✅ <b>Found {len(terabox_links)} Terabox links</b>.\nBatch ID: <code>{batch_id[:6]}</code>\nProcessing..."
+    )
 
     BATCH_JOBS[batch_id] = {
         "total_links": len(terabox_links),
@@ -255,33 +238,40 @@ async def message_handler(message: Message):
         "source_user_id": message.from_user.id,
         "source_message_id": message.message_id,
         "status_message": status_msg,
-        "lock": asyncio.Lock(),
-        "start_time": time.time()
+        "lock": asyncio.Lock()
     }
 
     for link in terabox_links:
         await TASK_QUEUE.put({"batch_id": batch_id, "original_link": link})
 
-# --- Startup ---
+@dp.message(CommandStart())
+async def start_handler(message: Message):
+    await message.reply(
+        "👋 <b>Welcome to the Terabox Bot!</b>\n\n"
+        "Send one or more <b>Terabox links</b> and I will fetch and forward them to you.\n\n"
+        "✅ Fast download\n"
+        "✅ Caching supported\n"
+        "✅ Forward to channel\n\n"
+        "Enjoy! 🚀"
+    )
+
+# --- Startup & Main ---
 async def on_startup(dispatcher: Dispatcher):
     await db_utils.initialize_database()
     for i in range(config.CONCURRENT_WORKERS):
         asyncio.create_task(link_processor_worker(i + 1))
-    logger.info(f"Bot started with {config.CONCURRENT_WORKERS} workers.")
-
-@dp.message(CommandStart())
-async def start_handler(message: Message):
-    text = (
-        "👋 Welcome to <b>Terabox Downloader Bot</b>!\n\n"
-        "✅ Send me <b>Terabox links</b>, I will download and send you the files.\n"
-        "✅ Files also forwarded to our channel.\n"
-        "✅ Progress + ETA shown.\n\n"
-        f"Bot uptime: {get_uptime()} sec 🚀"
-    )
-    await message.reply(text)
+    logger.info(f"Bot started with {config.CONCURRENT_WORKERS} concurrent workers.")
 
-async def run_bot():
+async def main():
     dp.startup.register(on_startup)
     dp.message.register(message_handler)
     dp.message.register(start_handler, CommandStart())
     await dp.start_polling(bot)
+
+# For main.py
+async def main_loop_task():
+    await main()
+
+# Run standalone
+if __name__ == '__main__':
+    asyncio.run(main())