Improve leech progress stats and rename templates

plugins/file_rename.py

@@ -287,6 +287,22 @@ async def resolve_remote_filename(url: str, fallback: str = "downloaded_file") -
     return guess_filename_from_url(url, fallback=fallback)
 
 
+def build_leech_output_name(stem: str, ext_original: str, prefix: str = None, suffix: str = None) -> str:
+    if not stem:
+        stem = 'downloaded_file'
+    if not os.path.splitext(stem)[1]:
+        stem = f"{stem}{ext_original or '.bin'}"
+    return _apply_prefix_suffix_to_name(stem, '', prefix, suffix).rstrip('.')
+
+
+def resolve_leech_format_template(rename_formats, original_name: str, default_template: str):
+    for fmt in rename_formats:
+        hint = fmt.get("hint", "")
+        if hint and hint.lower() in (original_name or "").lower():
+            return fmt.get("template", default_template), hint
+    return default_template, None
+
+
 async def _update_leech_status(task: dict, status: str, current: int = 0, total: int = 0, speed: float = 0.0, elapsed: float = 0.0):
     if not task.get("status_message"):
         return
@@ -317,9 +333,14 @@ async def _update_leech_status(task: dict, status: str, current: int = 0, total:
     else:
         size_text = humanbytes(current) if current else "0 B"
 
+    if task.get("display_name"):
+        display_name = task["display_name"]
+    else:
+        display_name = "Unknown"
+
     text = (
         f"🧲 Task {task['task_id']}\n"
-        f"Name: {task.get('display_name', 'Unknown')}\n"
+        f"Name: {display_name}\n"
         f"Status: {status}\n"
         f"Progress: {bar} {percent:.0f}%\n"
         f"Speed: {humanbytes(speed) if speed else '—'}/s\n"
@@ -354,6 +375,7 @@ async def _download_url_with_progress(url: str, output_path: str, task: dict):
                 raise RuntimeError(f"Download failed with status {resp.status}")
             total = int(resp.headers.get("Content-Length", 0) or 0)
             downloaded = 0
+            await _update_leech_status(task, "Downloading", current=downloaded, total=total, speed=0, elapsed=0)
             with open(output_path, "wb") as handle:
                 async for chunk in resp.content.iter_chunked(1024 * 64):
                     if task.get("cancelled"):
@@ -365,8 +387,9 @@ async def _download_url_with_progress(url: str, output_path: str, task: dict):
                     now = time.time()
                     elapsed = max(1, int(now - task.get("started_at", now)))
                     speed = downloaded / elapsed if elapsed else 0
-                    if (now - task.get("last_status_update", 0)) >= 2 or downloaded >= total:
+                    if (now - task.get("last_status_update", 0)) >= 1 or downloaded >= total:
                         await _update_leech_status(task, "Downloading", current=downloaded, total=total, speed=speed, elapsed=elapsed)
+            await _update_leech_status(task, "Downloading", current=downloaded, total=total, speed=0, elapsed=max(1, int(time.time() - task.get("started_at", time.time()))))
             return output_path
 
 
@@ -447,7 +470,9 @@ async def _process_leech_file(client, user_id, input_path, display_name, origina
 
     season, episode = extract_season_episode(file_name)
     quality = extract_quality(file_name)
-    format_template = await codeflixbots.get_format_template(user_id) or os.path.splitext(file_name)[0]
+    default_template = await codeflixbots.get_format_template(user_id) or os.path.splitext(file_name)[0]
+    rename_formats = await codeflixbots.get_rename_formats(user_id)
+    format_template, selected_hint = resolve_leech_format_template(rename_formats, original_file_name, default_template)
 
     replacements = {
         '{season}': season or 'XX',
@@ -462,10 +487,9 @@ async def _process_leech_file(client, user_id, input_path, display_name, origina
     stem = format_template
     if task.get('custom_name'):
         stem = task['custom_name']
-    new_filename = _apply_prefix_suffix_to_name(stem, ext_original, prefix, suffix)
-
-    if not os.path.splitext(new_filename)[1]:
-        new_filename = f"{new_filename}{ext_original}"
+    new_filename = build_leech_output_name(stem, ext_original, prefix, suffix)
+    if selected_hint:
+        task['last_selected_hint'] = selected_hint
 
     metadata_path = f"metadata/{new_filename}"
     thumb_path = None
@@ -594,6 +618,7 @@ async def _run_leech_task(client, task: dict):
 
         display_name = await resolve_remote_filename(url, fallback=task.get("requested_name", "downloaded_file"))
         task["display_name"] = display_name
+        task["requested_name"] = task.get("custom_name") or display_name
         await _update_leech_status(task, "Preparing")
 
         ext = os.path.splitext(display_name)[1].lower()

tests/test_file_rename.py

@@ -89,6 +89,8 @@ from plugins.file_rename import (
     guess_filename_from_url,
     prepare_leech_workspace,
     infer_media_type_hint,
+    build_leech_output_name,
+    resolve_leech_format_template,
 )
 
 
@@ -130,3 +132,18 @@ def test_infer_media_type_hint_prefers_video_extension():
 
 def test_infer_media_type_hint_falls_back_to_hint_when_no_extension():
     assert infer_media_type_hint('random-token', fallback_hint='video') == 'video'
+
+
+def test_build_leech_output_name_uses_custom_name_with_extension():
+    assert build_leech_output_name('aaa.mkv', '.mkv', None, None) == 'aaa.mkv'
+
+
+def test_build_leech_output_name_uses_template_when_custom_name_has_no_extension():
+    assert build_leech_output_name('aaa', '.mkv', None, None) == 'aaa.mkv'
+
+
+def test_resolve_leech_format_template_uses_matching_hint():
+    templates = [
+        {'hint': 'Agents', 'template': 'Agents of the Four Seasons Dance of Spring S{season}E{episode} {quality} WEB-DL Multi Audio ESub'},
+    ]
+    assert resolve_leech_format_template(templates, 'Agents of the Four Seasons Dance of Spring S01E12 720p.mkv', 'default') == ('Agents of the Four Seasons Dance of Spring S{season}E{episode} {quality} WEB-DL Multi Audio ESub', 'Agents')