Update terabox_utils.py

terabox_utils.py

@@ -8,12 +8,11 @@ import logging
 import os
 import time
 import math
-import subprocess
 from typing import Optional, Tuple
 
 import config
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("terabox_utils")
 os.makedirs("downloads", exist_ok=True)
 
 # --- Utility Functions ---
@@ -42,9 +41,7 @@ async def extract_terabox_short_id(full_url: str) -> Optional[str]:
             return m.group(1)
     return None
 
-# --- Main Link Extraction ---
 async def get_final_url_and_filename(original_link: str) -> Tuple[Optional[str], Optional[str], Optional[str]]:
-    # First, try WORKER API
     payload = {"link": original_link}
     headers = {"User-Agent": "Mozilla/5.0"}
 
@@ -66,13 +63,11 @@ async def get_final_url_and_filename(original_link: str) -> Tuple[Optional[str],
         return dl, fn, None
 
     except Exception as e:
-        logger.error(f"[Worker] Failed for {original_link} → {str(e)}")
-        return None, None, f"Worker API failed: {str(e)}"
+        return None, None, str(e)
 
-# --- Downloader ---
 async def download_terabox_file(bot_instance, chat_id, msg_id, url, filename):
     safe_fn = re.sub(r'[\\/*?:"<>|]', "_", filename)[:200]
-    raw_download_path = os.path.join("downloads", f"{chat_id}_{time.time()}_{safe_fn}")
+    download_path = os.path.join("downloads", f"{chat_id}_{time.time()}_{safe_fn}")
 
     try:
         loop = asyncio.get_event_loop()
@@ -93,7 +88,7 @@ async def download_terabox_file(bot_instance, chat_id, msg_id, url, filename):
         dl_size = 0
         last_update = time.time()
 
-        with open(raw_download_path, 'wb') as f:
+        with open(download_path, 'wb') as f:
             for chunk in r.iter_content(chunk_size=1024 * 1024):
                 if chunk:
                     f.write(chunk)
@@ -102,48 +97,21 @@ async def download_terabox_file(bot_instance, chat_id, msg_id, url, filename):
                     if time.time() - last_update > 2.5:
                         pct = (dl_size / total_size * 100) if total_size > 0 else 0
                         prog_text = (
-                            f"📥 **Downloading:** `{filename}`\n"
+                            f"📥 <b>Downloading:</b> <code>{filename}</code>\n"
                             f"Progress: {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="Markdown"
+                                chat_id, msg_id, prog_text, parse_mode="HTML"
                             )
                         except Exception:
                             pass
 
                         last_update = time.time()
 
-        # Now decide whether to convert
-        if config.ENABLE_FFMPEG_CONVERT:
-            # Optional ffmpeg convert (if ENABLE_FFMPEG_CONVERT = True)
-            new_filename = os.path.splitext(safe_fn)[0] + "_converted.mp4"
-            converted_path = os.path.join("downloads", f"{chat_id}_{time.time()}_{new_filename}")
-            thumb_path = os.path.join("downloads", f"{chat_id}_{time.time()}_thumb.jpg")
-
-            # Convert to mp4
-            ffmpeg_convert_cmd = [
-                "ffmpeg", "-y", "-i", raw_download_path,
-                "-c:v", "libx264", "-preset", "fast", "-c:a", "aac",
-                "-movflags", "+faststart", converted_path
-            ]
-            subprocess.run(ffmpeg_convert_cmd, check=True)
-
-            # Generate thumbnail
-            ffmpeg_thumb_cmd = [
-                "ffmpeg", "-y", "-i", converted_path,
-                "-ss", "00:00:01.000", "-vframes", "1", thumb_path
-            ]
-            subprocess.run(ffmpeg_thumb_cmd, check=True)
-
-            # Cleanup raw file
-            os.remove(raw_download_path)
-            return converted_path, thumb_path, None
-        else:
-            # No conversion, return raw path
-            return raw_download_path, None, None
+        return download_path, None, None
 
     except Exception as e:
-        if os.path.exists(raw_download_path):
-            os.remove(raw_download_path)
+        if os.path.exists(download_path):
+            os.remove(download_path)
         return None, None, str(e)