Enhance download progress reporting: update progress hook to include total and downloaded bytes, and modify progress bar representation

Author: Shadoworbs

bot_package/downloader.py

@@ -1,4 +1,6 @@
 import os
+import pprint
+import sys
 import yt_dlp
 import asyncio
 import time
@@ -112,7 +114,7 @@ def _run_yt_dlp_download(
     user_download_dir = get_user_download_path(user_id)
     cancel_event = active_downloads.get(original_msg_id)
 
-    def download_progress_hook(d):
+    def download_progress_hook(d: dict):
         # Check for cancellation signal
         if cancel_event and cancel_event.is_set():
             # Use a specific exception type if yt-dlp allows interrupting downloads
@@ -128,27 +130,36 @@ def download_progress_hook(d):
                 current_time - last_update_time.get((chat_id, message_id), 0)
                 > UPDATE_INTERVAL
             ):
-                percentage_str = d.get("_percent_str", "0%").strip("%")
+                # print("I got what I needed, quitting...")
+                # with open("progresshook.log", "a", encoding="utf-8") as f:
+                #     for key, value in d.items():
+                #         f.write(f'{key}: {value}\n')
+                # print("I got what i needed, quitting...")
+                # # pprint.pprint(d.items())
+                # sys.exit(1)
+                total_bytes = d.get("total_bytes_estimate", 1)
+                downloaded_bytes = d.get("downloaded_bytes", 1)
+                total_mb = total_bytes / (1024 * 1024) if total_bytes else 0
+                downloaded_mb = (
+                    downloaded_bytes / (1024 * 1024) if downloaded_bytes else 0
+                )
+                percentage_str = d.get("_percent", 0.0)
+
                 try:
                     percentage_float = float(percentage_str)
                 except ValueError:
                     percentage_float = 0.0
 
                 speed = d.get("_speed_str", "N/A")
                 eta = d.get("_eta_str", "N/A")
-                total_bytes = d.get("total_bytes") or d.get("total_bytes_estimate", 0)
-                downloaded_bytes = d.get("downloaded_bytes", 0)
 
                 progress_bar = create_progress_bar(percentage_float)
                 total_mb = total_bytes / (1024 * 1024) if total_bytes else 0
-                downloaded_mb = (
-                    downloaded_bytes / (1024 * 1024) if downloaded_bytes else 0
-                )
 
                 progress_text = (
                     f"{dl_text}\n"
                     f"**By:** {user_mention}\n**User ID:** `{user_id}`\n\n"
-                    f"**Progress:** {progress_bar} {percentage_float:.1f}%\n"
+                    f"**Progress:** {progress_bar} {percentage_float:.2f}%\n"
                     f"File Size: `{total_mb:.2f} MB`\n"
                 )
 

bot_package/handlers.py

@@ -408,7 +408,7 @@ async def youtube_url_handler(client: Client, message):
             video_id,
             user_id,
         )
-        convert_thumbnail_to_jpeg(args)  # Convert thumbnail to JPEG
+        # convert_thumbnail_to_jpeg(args)  # Convert thumbnail to JPEG
         VIDEO_ID.append(video_id)  # Store the video ID for later use
         print("Thumbnail conversion complete.")
 

bot_package/helpers.py

@@ -37,7 +37,7 @@ def create_progress_bar(percentage: float, length: int = PROGRESS_BAR_LENGTH) ->
     if not 0 <= percentage <= 100:
         percentage = max(0, min(100, percentage))  # Clamp percentage
     filled_length = int(length * percentage // 100)
-    bar = "█" * filled_length + "░" * (length - filled_length)
+    bar = "•" * filled_length + "°" * (length - filled_length)
     return f"[{bar}]"