Update bot/handlers.py

bot/handlers.py

@@ -174,9 +174,9 @@ def setup_handlers(app: Client) -> None:
             if not j.get("ok"):
                 return await q.answer("Failed", show_alert=True)
 
-            await q.answer("Default set ✅", show_alert=False)
+            await q.answer("Current set ✅", show_alert=False)
             try:
-                await q.message.edit_text(f"✅ Default set: `{value}`")
+                await q.message.edit_text(f"✅ Current profile set: `{value}`")
             except Exception:
                 pass
             return
@@ -211,7 +211,6 @@ def setup_handlers(app: Client) -> None:
             if not isinstance(j, dict):
                 return await safe_reply(m, f"❌ profile_add bad response: `{j}`")
 
-            # ✅ handle both response shapes
             if not j.get("ok") and not (isinstance(j.get("data"), dict) and j["data"].get("ok")):
                 return await safe_reply(m, texts.PROFILE_ADD_FAIL.format(j))
 
@@ -237,9 +236,17 @@ def setup_handlers(app: Client) -> None:
             return await safe_reply(m, texts.PROFILE_LIST_FAIL.format(j))
 
         profiles = j.get("profiles") or []
-        txt = f"Default: `{j.get('default_profile_id')}`\n\n"
-        for p in profiles:
-            txt += f"- `{p['profile_id']}` | {p.get('label')} | refresh={p.get('has_refresh')} | ch={p.get('channel_title')}\n"
+        default_id = j.get("default_profile_id")
+
+        txt = f"Current: `{default_id}`\n\n"
+        for i, p in enumerate(profiles, start=1):
+            pid = p.get("profile_id")
+            ch = (p.get("channel_title") or "—").strip()
+            cid = p.get("client_id_hint") or "—"
+            sec = p.get("client_secret_hint") or "****…****"
+            connected = "✅ Connected" if (p.get("has_refresh") and p.get("channel_id")) else "⏳ Pending"
+            cur = "🟢 Current" if pid == default_id else ""
+            txt += f"[{i}] {ch} | {cur} | id: {cid} | secret: {sec} | {connected}\n"
 
         kb = profiles_keyboard(profiles)
         await safe_reply(m, txt, reply_markup=kb)
@@ -284,13 +291,44 @@ def setup_handlers(app: Client) -> None:
 
         task_id = f"{uid}:{m.id}"
         create_task(task_id, uid)
-        set_task(task_id, "downloading", "")
 
         file_path = ""
+        file_size = 0
+
         try:
-            file_path, _file_size, file_name = await download_to_temp(app_, m)
+            # ---------------- Download with ETA ----------------
+            set_task(task_id, "downloading", "")
+
+            dl_se = SpeedETA()
+            dl_last_edit = 0.0
+
+            async def dl_prog(done: int, total: int):
+                nonlocal dl_last_edit
+                snap = dl_se.update(done, total)
+                if time.time() - dl_last_edit < 2.0 and done < total:
+                    return
+                dl_last_edit = time.time()
+                txt = (
+                    f"⬇️ Downloading…\n"
+                    f"{human_bytes(done)}/{human_bytes(total)}\n"
+                    f"speed: {human_bytes(snap['speed_bps'])}/s | eta: {human_eta(snap['eta_sec'])}"
+                )
+                await safe_edit(status, txt)
+
+            file_path, file_size, file_name, dl_sec = await download_to_temp(
+                app_, m,
+                progress=dl_prog,
+                progress_args=(),
+            )
+            dl_avg_bps = int((file_size or 0) / max(dl_sec, 0.001))
+
+            # parse title/desc after download
             title, desc = extract_title_description(m, file_name)
 
+            # ---------------- Upload with ETA ----------------
+            set_task(task_id, "uploading", "")
+            up_t0 = time.time()
+
             se = SpeedETA()
             last_edit = 0.0
 
@@ -307,8 +345,6 @@ def setup_handlers(app: Client) -> None:
                 )
                 await safe_edit(status, txt)
 
-            set_task(task_id, "uploading", "")
-
             yt_url = await upload_video(
                 access_tok,
                 file_path,
@@ -318,10 +354,20 @@ def setup_handlers(app: Client) -> None:
                 progress_cb=prog,
             )
 
+            up_sec = max(0.001, time.time() - up_t0)
+            up_avg_bps = int((file_size or 0) / up_sec)
+
             await record_upload(uid, use_profile_id)
 
             set_task(task_id, "done", "", yt_url=yt_url)
-            await safe_reply(m, f"{texts.DONE}\n\n🎬 {title}\n🔗 {yt_url}")
+            await safe_reply(
+                m,
+                f"{texts.DONE}\n\n"
+                f"🎬 {title}\n"
+                f"🔗 {yt_url}\n\n"
+                f"⬇️ Download: {human_eta(int(dl_sec))} | avg {human_bytes(dl_avg_bps)}/s\n"
+                f"⬆️ Upload: {human_eta(int(up_sec))} | avg {human_bytes(up_avg_bps)}/s"
+            )
 
         except Exception as e:
             set_task(task_id, "error", str(e))