Update bot.py

bot.py

@@ -5,6 +5,7 @@ import logging
 import os
 import re
 import uuid
+import time
 from typing import Dict
 
 from aiogram import Bot, Dispatcher, types, F
@@ -35,7 +36,8 @@ logger = logging.getLogger("bot")
 bot = Bot(
     token=config.BOT_TOKEN,
     default=DefaultBotProperties(
-        parse_mode=ParseMode.HTML
+        parse_mode=ParseMode.HTML,
+        link_preview_is_disabled=True
     )
 )
 
@@ -58,6 +60,8 @@ async def link_processor_worker(worker_id: int):
         file_info = None
         error_msg = f"An unknown error occurred for link: {original_link}"
 
+        start_time = time.time()
+
         try:
             short_id = await terabox.extract_terabox_short_id(original_link)
             if not short_id:
@@ -72,7 +76,10 @@ async def link_processor_worker(worker_id: int):
                 if error:
                     raise ValueError(error)
 
-                local_filepath, download_error = await terabox.download_terabox_file(
+                local_filepath, thumb_path, download_error = await terabox.download_terabox_file(
+                    bot,
+                    batch_info["source_chat_id"],
+                    batch_info["status_message_id"],
                     download_url,
                     raw_filename
                 )
@@ -85,6 +92,7 @@ async def link_processor_worker(worker_id: int):
                     'name': raw_filename,
                     'size': os.path.getsize(local_filepath),
                     'short_id': short_id,
+                    'thumb': thumb_path
                 }
 
         except Exception as e:
@@ -99,23 +107,31 @@ async def link_processor_worker(worker_id: int):
 
             processed, total = batch_info['processed_links'], batch_info['total_links']
 
+            elapsed = time.time() - batch_info['start_time']
+            avg_per_file = elapsed / processed if processed > 0 else 1
+            remaining = (total - processed) * avg_per_file
+            eta_text = f"~{int(remaining):d}s" if remaining > 1 else "<1s"
+
             try:
-                await batch_info["status_message"].edit_text(
-                    f"⚙️ Batch <code>{batch_id[:6]}</code> in progress...\nProcessed {processed}/{total} links.",
-                    disable_web_page_preview=True
+                await bot.edit_message_text(
+                    chat_id=batch_info["source_chat_id"],
+                    message_id=batch_info["status_message_id"],
+                    text=(
+                        f"⚙️ <b>Batch</b> <code>{batch_id[:6]}</code> <b>Progress</b>: {processed}/{total} "
+                        f"(ETA: {eta_text})\n\n"
+                        f"Current link:\n<code>{original_link}</code>"
+                    )
                 )
             except TelegramBadRequest:
                 pass
 
-            await asyncio.sleep(0.3)  # prevent rate limit
-
             if processed == total:
                 logger.info(f"Batch {batch_id[:6]} complete. Triggering final processing.")
                 await handle_batch_completion(batch_id)
 
         TASK_QUEUE.task_done()
 
-async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Message:
+async def send_and_cache_file(chat_id: int, file_info: dict, reply_to: int, caption: str):
     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')
@@ -125,13 +141,13 @@ async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Me
 
     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)
+        sent_message = await bot.send_video(chat_id, file_path_or_id, caption=caption, supports_streaming=True, reply_to_message_id=reply_to)
         media_type = 'video'
     elif media_type == 'audio' or filename.lower().endswith(audio_exts):
-        sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption)
+        sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption, reply_to_message_id=reply_to)
         media_type = 'audio'
     else:
-        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption)
+        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption, reply_to_message_id=reply_to)
         media_type = 'document'
 
     if not file_info.get('cached') and sent_message:
@@ -140,14 +156,11 @@ async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Me
             file_info['short_id'], file_id_to_cache, filename, media_type, file_info['size']
         )
 
-    return sent_message
-
 async def handle_batch_completion(batch_id: str):
     batch = BATCH_JOBS.get(batch_id)
     if not batch:
         return
 
-    status_msg = batch["status_message"]
     successful_downloads = batch["successful_downloads"]
 
     try:
@@ -155,15 +168,23 @@ async def handle_batch_completion(batch_id: str):
             failed_links_text = "\n".join(
                 [f"- {x['link']} → {x['error']}" for x in batch['failed_links']]
             )
-            await status_msg.edit_text(
-                f"❌ Batch <code>{batch_id[:6]}</code> failed. No files could be processed.\nDetails:\n{failed_links_text}",
-                disable_web_page_preview=True
+            await bot.edit_message_text(
+                chat_id=batch["source_chat_id"],
+                message_id=batch["status_message_id"],
+                text=(
+                    f"❌ <b>Batch</b> <code>{batch_id[:6]}</code> failed. No files could be processed.\n\n"
+                    f"<b>Details</b>:\n{failed_links_text}"
+                )
             )
             return
 
-        await status_msg.edit_text(
-            f"✅ Batch <code>{batch_id[:6]}</code> downloaded. Preparing to send {len(successful_downloads)} files...",
-            disable_web_page_preview=True
+        await bot.edit_message_text(
+            chat_id=batch["source_chat_id"],
+            message_id=batch["status_message_id"],
+            text=(
+                f"✅ <b>Batch</b> <code>{batch_id[:6]}</code> downloaded.\n"
+                f"Sending {len(successful_downloads)} files..."
+            )
         )
 
         if config.FORWARD_CHANNEL_ID:
@@ -173,30 +194,38 @@ async def handle_batch_completion(batch_id: str):
                 batch["source_message_id"]
             )
             for item in successful_downloads:
-                caption = f"🎬 <code>{item.get('name') or item.get('filename')}</code>"
-                await send_and_cache_file(config.FORWARD_CHANNEL_ID, item, caption)
+                caption = f"`{item.get('name') or item.get('filename')}`"
+                await send_and_cache_file(config.FORWARD_CHANNEL_ID, item, batch["source_message_id"], caption)
                 await asyncio.sleep(1)
 
         for item in successful_downloads:
-            caption = f"🎬 <code>{item.get('name') or item.get('filename')}</code>"
-            await send_and_cache_file(batch["source_chat_id"], item, caption)
+            caption = f"`{item.get('name') or item.get('filename')}`"
+            await send_and_cache_file(batch["source_chat_id"], item, batch["source_message_id"], caption)
 
-        summary = f"✅ Batch <code>{batch_id[:6]}</code> complete: {len(successful_downloads)} files sent."
+        summary = f"✅ <b>Batch</b> <code>{batch_id[:6]}</code> complete: {len(successful_downloads)} files sent."
         if batch["failed_links"]:
             summary += f"\n❌ {len(batch['failed_links'])} links failed."
 
-        await status_msg.edit_text(summary, disable_web_page_preview=True)
+        await bot.edit_message_text(
+            chat_id=batch["source_chat_id"],
+            message_id=batch["status_message_id"],
+            text=summary
+        )
 
     except Exception as e:
         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 <code>{batch_id[:6]}</code>.",
-            disable_web_page_preview=True
+        await bot.edit_message_text(
+            chat_id=batch["source_chat_id"],
+            message_id=batch["status_message_id"],
+            text=f"A critical error occurred while sending files for batch <code>{batch_id[:6]}</code>."
         )
     finally:
         for item in successful_downloads:
             if not item.get('cached') and os.path.exists(item['path']):
                 os.remove(item['path'])
+            if item.get('thumb') and os.path.exists(item['thumb']):
+                os.remove(item['thumb'])
+
         del BATCH_JOBS[batch_id]
 
 # --- Handlers ---
@@ -204,14 +233,14 @@ async def handle_batch_completion(batch_id: str):
 async def start_handler(message: Message):
     text = (
         "👋 <b>Welcome to the Terabox Downloader Bot!</b>\n\n"
-        "📥 Send me any valid <b>Terabox</b> link(s), and I will fetch and send the files to you.\n\n"
-        "✅ Multi-link batch supported!\n"
-        "💾 Cache enabled → faster for repeat links.\n"
-        "📢 Original message will be forwarded to: "
-        f"<b>@{config.FORCE_SUB_CHANNEL_USERNAME}</b> (if configured).\n\n"
-        "🚀 <i>Just send your link(s) below ⬇️</i>"
+        "📥 Send me any valid Terabox link(s) and I will fetch the files and send them to you.\n\n"
+        f"📢 Make sure you are a member of @{config.FORCE_SUB_CHANNEL_USERNAME}\n\n"
+        "🚀 Supports multiple links per message.\n"
+        "💾 Auto-cache enabled.\n"
+        "🔄 Forwarding original message to channel enabled.\n\n"
+        "✅ <i>Just send your links below ⬇️</i>"
     )
-    await message.answer(text, disable_web_page_preview=True)
+    await message.reply(text, reply_to_message_id=message.message_id)
 
 @dp.message(F.text | F.caption)
 async def message_handler(message: Message):
@@ -234,7 +263,11 @@ async def message_handler(message: Message):
         return
 
     batch_id = str(uuid.uuid4())
-    status_msg = await message.answer(f"✅ Found {len(terabox_links)} link(s). Queued as batch <code>{batch_id[:6]}</code>.", disable_web_page_preview=True)
+
+    status_msg = await message.reply(
+        f"✅ <b>Found</b> {len(terabox_links)} links. <b>Queued</b> as batch <code>{batch_id[:6]}</code>.",
+        reply_to_message_id=message.message_id
+    )
 
     BATCH_JOBS[batch_id] = {
         "total_links": len(terabox_links),
@@ -244,8 +277,9 @@ async def message_handler(message: Message):
         "source_chat_id": message.chat.id,
         "source_user_id": message.from_user.id,
         "source_message_id": message.message_id,
-        "status_message": status_msg,
-        "lock": asyncio.Lock()
+        "status_message_id": status_msg.message_id,
+        "lock": asyncio.Lock(),
+        "start_time": time.time()
     }
 
     for link in terabox_links: