feat: live progress bar every 5s, extended to 2h polling

main.py

@@ -728,15 +728,18 @@ async def _process_archive(client: Client, message: Message, state: dict, reply_
         f"🆔 `{archive_id}`\n"
         f"📂 **الحساب:** {acc_info['label']}\n"
         f"🌐 **المساحة:** `{user_space_name[:25]}-archiver`\n"
-        f"📦 **الداتاسيت:** `{user_space_name[:20]}/archive`\n"
+        f"📦 **الداتاسيت:** `multimedia-cryptography-benchmarks/archive`\n"
         f"📥 **المصدر:** القناة (تليغرام)\n"
-        "⏳ جارٍ متابعة التقدم..."
+        "⏳ **بانتظار بدء التحميل...**"
     )
 
     start_time = time.time()
     last_pct = -1
-    for poll_i in range(60):
-        await asyncio.sleep(3)
+    last_progress_text = ""
+    max_poll_seconds = 7200
+
+    while time.time() - start_time < max_poll_seconds:
+        await asyncio.sleep(5)
         progress = api_call("GET", f"archive/progress", params={"archive_id": archive_id})
         p = progress.get("progress", {})
         status = p.get("status", "")
@@ -750,20 +753,42 @@ async def _process_archive(client: Client, message: Message, state: dict, reply_
         downloaded_bytes = p.get("downloaded_bytes", 0)
         total_bytes = p.get("total_bytes", 0)
         eta_seconds = p.get("eta_seconds", 0)
-        dataset_size_gb = p.get("dataset_size_gb", 0)
 
         elapsed = time.time() - start_time
 
         if status in ("completed", "failed"):
-            break
+            elapsed_str = f"{int(elapsed // 60)}د {int(elapsed % 60)}ث"
+            await msg.edit(
+                f"{'✅' if status == 'completed' else '❌'} **{'اكتملت' if status == 'completed' else 'فشلت'} الأرشفة**\n\n"
+                f"🆔 `{archive_id}`\n"
+                f"📁 `{state['file_name'][:35]}`\n"
+                f"📂 **{acc_info['label']}**\n"
+                f"⏱ **الوقت:** {elapsed_str}\n"
+                f"{'📋' if status == 'completed' else '⚠️'} `{msg_text[:80]}`",
+                parse_mode=ParseMode.MARKDOWN
+            )
+            delete_session(reply_id)
+            USER_STATES.pop(reply_id, None)
+            if message.chat:
+                CURRENT_SESSION.pop(message.chat.id, None)
+            return
 
-        if pct > last_pct or (poll_i % 3 == 0):
+        if pct > last_pct or int(elapsed) % 10 == 0:
             bar_len = 14
             filled = int(bar_len * pct / 100)
             bar = "█" * filled + "░" * (bar_len - filled)
 
-            phase_icon = "📥" if "تحميل" in msg_text else "📋" if "نسخ" in msg_text else "📤" if "رفع" in msg_text else "📦" if "داتاسيت" in msg_text else "⏳"
-            phase_name = "تحميل من القناة" if "تحميل" in msg_text else "نسخ إلى الداتاسيت" if "نسخ" in msg_text else "رفع إلى HuggingFace" if "رفع" in msg_text else "قيد التجهيز"
+            if "تحميل" in msg_text:
+                phase_icon, phase_name = "📥", "تحميل من القناة"
+            elif "رفع" in msg_text or "upload" in msg_text.lower():
+                phase_icon, phase_name = "📤", "رفع إلى HuggingFace"
+            elif "نسخ" in msg_text or "dataset" in msg_text.lower():
+                phase_icon, phase_name = "📦", "نسخ إلى الداتاسيت"
+            else:
+                phase_icon, phase_name = "⏳", msg_text[:40] or "قيد التجهيز"
+
+            elapsed_m, elapsed_s = divmod(int(elapsed), 60)
+            elapsed_str = f"{elapsed_m:02d}:{elapsed_s:02d}"
 
             progress_text = (
                 f"━━━━━━━━━━━━━━━━━━\n"
@@ -773,21 +798,23 @@ async def _process_archive(client: Client, message: Message, state: dict, reply_
                 f"📁 `{state['file_name'][:35]}`\n"
                 f"📂 **{acc_info['label']}**\n"
                 f"🌐 `{user_space_name[:25]}-archiver`\n"
-                f"📦 `{user_space_name[:20]}/archive`\n"
-                f"📥 عبر القناة\n\n"
+                f"📥 التحميل عبر القناة\n\n"
                 f"`{bar}` **{pct}%**\n"
                 f"📌 **المرحلة:** {phase_name}\n"
             )
             if downloaded_bytes and total_bytes and total_bytes > 0:
-                progress_text += f"📊 **الحجم:** {downloaded_bytes/1024/1024:.1f} / {total_bytes/1024/1024:.1f} MB\n"
+                progress_text += f"📊 {downloaded_bytes/1024/1024:.1f} / {total_bytes/1024/1024:.1f} MB\n"
             elif downloaded_bytes and not total_bytes:
-                progress_text += f"📊 **الحجم:** {downloaded_bytes/1024/1024:.1f} MB\n"
+                progress_text += f"📊 {downloaded_bytes/1024/1024:.1f} MB\n"
             if speed and speed > 0:
                 speed_mb = speed / 1024 / 1024
-                progress_text += f"⚡ **السرعة:** {speed_mb:.1f} MB/s\n"
-            if eta_seconds and eta_seconds > 0:
-                eta_m, eta_s = divmod(eta_seconds, 60)
-                progress_text += f"⏱ **��لوقت المتبقي:** {int(eta_m)}د {int(eta_s)}ث\n"
+                progress_text += f"⚡ {speed_mb:.1f} MB/s"
+                if downloaded_bytes and total_bytes and total_bytes > 0:
+                    remaining = total_bytes - downloaded_bytes
+                    eta = remaining / speed if speed > 0 else 0
+                    eta_m, eta_s = divmod(int(eta), 60)
+                    progress_text += f" | ⏱ متبقي {eta_m:02d}:{eta_s:02d}"
+                progress_text += "\n"
             if disk_free and disk_total:
                 free_gb = disk_free / (1024**3)
                 total_gb = disk_total / (1024**3)
@@ -795,108 +822,33 @@ async def _process_archive(client: Client, message: Message, state: dict, reply_
                 disk_bar_len = 10
                 disk_filled = int(disk_bar_len * used_gb / total_gb) if total_gb > 0 else 0
                 disk_bar = "█" * disk_filled + "░" * (disk_bar_len - disk_filled)
-                progress_text += f"💾 **عتاد المساحة:** `{disk_bar}` {used_gb:.0f}/{total_gb:.0f} GB ({free_gb:.0f} GB متبقي)\n"
-            if dataset_size_gb:
-                progress_text += f"📦 **حجم الداتاسيت:** {dataset_size_gb} GB\n"
-            progress_text += f"⏳ **الوقت المنقضي:** {elapsed:.0f}s\n"
+                progress_text += f"💾 `{disk_bar}` {used_gb:.0f}/{total_gb:.0f} GB متبقي {free_gb:.0f} GB\n"
+            progress_text += f"⏳ الوقت: {elapsed_str}\n"
             progress_text += f"━━━━━━━━━━━━━━━━━━\n"
-            progress_text += f"📋 `{msg_text[:60]}`"
-
-            try:
-                await msg.edit(progress_text, parse_mode=ParseMode.MARKDOWN)
-            except Exception:
-                pass
+            progress_text += f"📋 `{msg_text[:80]}`"
+
+            if progress_text != last_progress_text:
+                try:
+                    await msg.edit(progress_text, parse_mode=ParseMode.MARKDOWN)
+                    last_progress_text = progress_text
+                except Exception:
+                    pass
             last_pct = pct
-
-    final_progress = api_call("GET", f"archive/progress", params={"archive_id": archive_id})
-    pf = final_progress.get("progress", {})
-    final_status = pf.get("status", "completed")
-    final_msg = pf.get("message", "")
-
-    title = metadata.get("title") or metadata.get("name", "N/A")
-    release = metadata.get("release_date") or metadata.get("first_air_date", "")
-    year = release[:4] if release else ""
-
-    db_entry = {
-        "archive_id": archive_id,
-        "file_name": state["file_name"],
-        "file_size": state.get("file_size", 0),
-        "account": acc_info["name"],
-        "media_id": str(metadata.get("id", "")),
-        "media_type": metadata.get("media_type", ""),
-        "title": title,
-        "year": year,
-        "quality": quality,
-        "file_unique_id": state.get("file_unique_id", ""),
-        "genres": ", ".join(g.get("name", "") for g in metadata.get("genres", [])),
-        "rating": metadata.get("vote_average", 0),
-        "overview": (metadata.get("overview") or "")[:500],
-        "poster": metadata.get("poster_path", ""),
-        "backdrop": metadata.get("backdrop_path", ""),
-        "imdb_id": (metadata.get("external_ids") or {}).get("imdb_id", "") if isinstance(metadata.get("external_ids"), dict) else "",
-        "tmdb_json": json.dumps(metadata, ensure_ascii=False, default=str),
-        "timestamp": datetime.utcnow().isoformat(),
-        "status": "archived" if final_status == "completed" else "failed",
-    }
-
-    sql = f"""
-        INSERT OR REPLACE INTO archives 
-        (archive_id, file_name, file_size, account, media_id, media_type, 
-         title, year, genres, rating, overview, poster_path, backdrop_path,
-         imdb_id, tmdb_json, timestamp, status, telegram_file_unique_id, quality)
-        VALUES (
-            '{db_entry['archive_id'].replace("'","''")}',
-            '{db_entry['file_name'].replace("'","''")}',
-            {db_entry['file_size']},
-            '{db_entry['account'].replace("'","''")}',
-            '{db_entry['media_id'].replace("'","''")}',
-            '{db_entry['media_type'].replace("'","''")}',
-            '{db_entry['title'].replace("'","''")}',
-            '{db_entry['year'].replace("'","''")}',
-            '{db_entry['genres'].replace("'","''")}',
-            {db_entry['rating']},
-            '{db_entry['overview'].replace("'","''")}',
-            '{db_entry['poster'].replace("'","''")}',
-            '{db_entry['backdrop'].replace("'","''")}',
-            '{db_entry['imdb_id'].replace("'","''")}',
-            '{db_entry['tmdb_json'].replace("'","''")}',
-            '{db_entry['timestamp']}',
-            '{db_entry['status']}',
-            '{db_entry.get('file_unique_id', '').replace("'","''")}',
-            '{db_entry['quality'].replace("'","''")}'
+    else:
+        await msg.edit(
+            f"⚠️ **انتهت مهلة الانتظار** ({max_poll_seconds//60} دقيقة)\n\n"
+            f"🆔 `{archive_id}`\n"
+            f"📁 `{state['file_name'][:35]}`\n"
+            f"📂 **{acc_info['label']}**\n\n"
+            f"قد يكون التحميل لا يزال جارياً. استخدم `/status {archive_id}` للتحقق.",
+            parse_mode=ParseMode.MARKDOWN
         )
-    """
-    db_result = api_call("POST", "db/exec", {"sql": sql})
-
-    log_archive(archive_id, state["file_name"], acc_info["name"], title,
-                "success" if final_status == "completed" else "failed",
-                json.dumps({"progress": final_progress, "db_response": db_result}))
-
-    elapsed = time.time() - start_time
-    response = (
-        f"✅ **تمت الأرشفة بنجاح!**\n\n"
-        f"📁 **الملف:** `{state['file_name']}`\n"
-        f"🎬 **العمل:** {title} ({year})\n"
-        f"🎬 **الجودة:** {quality}\n"
-        f"📂 **الحساب:** {acc_info['label']}\n"
-        f"🆔 **الأرشيف:** `{archive_id}`\n"
-        f"📊 **الحجم:** {state.get('file_size', 0) / 1024 / 1024:.1f} MB\n"
-        f"⭐ **التقييم:** {metadata.get('vote_average', 'N/A')}/10\n"
-        f"📥 **المصدر:** القناة (تليغرام)\n"
-        f"⏱ **الوقت:** {elapsed:.0f}s\n"
-    )
-    if metadata.get("poster_path"):
-        response += f"🖼️ https://image.tmdb.org/t/p/w500{metadata['poster_path']}\n"
 
-    await msg.edit(response, parse_mode=ParseMode.MARKDOWN)
     delete_session(reply_id)
     USER_STATES.pop(reply_id, None)
     if message.chat:
         CURRENT_SESSION.pop(message.chat.id, None)
 
-    stats = await _generate_stats()
-    await message.reply(stats, parse_mode=ParseMode.MARKDOWN)
-
 async def _generate_stats() -> str:
     stats = api_call("GET", "stats/archive")
     if stats.get("error"):