Update terabox_utils.py

terabox_utils.py

@@ -8,11 +8,10 @@ import logging
 import os
 import time
 import math
-from typing import Optional, Tuple
 
 import config
 
-logger = logging.getLogger("terabox_utils")
+logger = logging.getLogger(__name__)
 os.makedirs("downloads", exist_ok=True)
 
 # --- Utility Functions ---
@@ -25,7 +24,7 @@ def format_bytes(size_bytes: int) -> str:
     s = round(size_bytes / p, 2)
     return f"{s} {size_name[i]}"
 
-async def extract_terabox_short_id(full_url: str) -> Optional[str]:
+async def extract_terabox_short_id(full_url: str):
     patterns = [
         r'terabox\.com/s/([a-zA-Z0-9_-]+)',
         r'teraboxapp\.com/s/([a-zA-Z0-9_-]+)',
@@ -41,7 +40,7 @@ async def extract_terabox_short_id(full_url: str) -> Optional[str]:
             return m.group(1)
     return None
 
-async def get_final_url_and_filename(original_link: str) -> Tuple[Optional[str], Optional[str], Optional[str]]:
+async def get_final_url_and_filename(original_link: str):
     payload = {"link": original_link}
     headers = {"User-Agent": "Mozilla/5.0"}
 
@@ -65,9 +64,9 @@ async def get_final_url_and_filename(original_link: str) -> Tuple[Optional[str],
     except Exception as e:
         return None, None, str(e)
 
-async def download_terabox_file(bot_instance, chat_id, msg_id, url, filename):
+async def download_terabox_file(url: str, filename: str):
     safe_fn = re.sub(r'[\\/*?:"<>|]', "_", filename)[:200]
-    download_path = os.path.join("downloads", f"{chat_id}_{time.time()}_{safe_fn}")
+    download_path = os.path.join("downloads", f"{time.time()}_{safe_fn}")
 
     try:
         loop = asyncio.get_event_loop()
@@ -94,24 +93,17 @@ async def download_terabox_file(bot_instance, chat_id, msg_id, url, filename):
                     f.write(chunk)
                     dl_size += len(chunk)
 
+                    # For debug:
                     if time.time() - last_update > 2.5:
                         pct = (dl_size / total_size * 100) if total_size > 0 else 0
-                        prog_text = (
-                            f"📥 <b>Downloading:</b> <code>{filename}</code>\n"
-                            f"Progress: {format_bytes(dl_size)}/{format_bytes(total_size)} ({pct:.1f}%)"
+                        logger.info(
+                            f"Downloading: {safe_fn} → {format_bytes(dl_size)}/{format_bytes(total_size)} ({pct:.1f}%)"
                         )
-                        try:
-                            await bot_instance.edit_message_text(
-                                chat_id, msg_id, prog_text, parse_mode="HTML"
-                            )
-                        except Exception:
-                            pass
-
                         last_update = time.time()
 
-        return download_path, None, None
+        return download_path, None
 
     except Exception as e:
         if os.path.exists(download_path):
             os.remove(download_path)
-        return None, None, str(e)
+        return None, str(e)