Update streamlit_app.py

streamlit_app.py

@@ -108,60 +108,77 @@ def _download_direct(url: str, dst: Path) -> Path:
 
 
 def _download_with_yt_dlp(url: str, dst: Path, password: str = "") -> Path:
+    """
+    Download a video.
+    1️⃣ Try yt_dlp with MP4‑first format.
+    2️⃣ If yt_dlp returns no MP4, fall back to a direct HTTP GET.
+    Returns the final MP4 Path.
+    """
+    # ---------- yt_dlp options ----------
     tmpl = str(dst / "%(id)s.%(ext)s")
-    fmt = "best[ext=mp4]/best"
-
-    opts = {
+    ydl_opts = {
         "outtmpl": tmpl,
-        "format": fmt,
+        "format": "best[ext=mp4]/best",   # prefer MP4
         "quiet": True,
         "noprogress": True,
         "nocheckcertificate": True,
         "merge_output_format": "mp4",
-        "fragment_retries": 0,
         "force_ipv4": True,
         "retries": 3,
         "socket_timeout": 30,
+        "no_playlist": True,
     }
     if password:
-        opts["videopassword"] = password
+        ydl_opts["videopassword"] = password
 
-    progress_bar = st.empty()
-    status_text = st.empty()
+    # ---------- Streamlit progress UI ----------
+    bar, txt = st.empty(), st.empty()
 
-    def _progress_hook(d):
+    def _hook(d):
         if d["status"] == "downloading":
             total = d.get("total_bytes") or d.get("total_bytes_estimate")
-            downloaded = d.get("downloaded_bytes", 0)
+            done = d.get("downloaded_bytes", 0)
             if total:
-                pct = downloaded / total
-                progress_bar.progress(pct)
-                status_text.caption(f"Downloading… {pct:.0%}")
+                pct = done / total
+                bar.progress(pct)
+                txt.caption(f"Downloading… {pct:.0%}")
         elif d["status"] == "finished":
-            progress_bar.progress(1.0)
-            status_text.caption("Download complete, processing…")
+            bar.progress(1.0)
+            txt.caption("Download complete, processing…")
 
-    opts["progress_hooks"] = [_progress_hook]
+    ydl_opts["progress_hooks"] = [_hook]
 
+    # ---------- Attempt yt_dlp ----------
     try:
-        with yt_dlp.YoutubeDL(opts) as ydl:
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             ydl.extract_info(url, download=True)
     finally:
-        progress_bar.empty()
-        status_text.empty()
+        bar.empty()
+        txt.empty()
 
     mp4_files = list(dst.glob("*.mp4"))
-    if not mp4_files:
-        raise RuntimeError("No MP4 file was created.")
-    newest = max(mp4_files, key=lambda p: p.stat().st_mtime)
-
-    sha = _file_sha256(newest)
-    if sha:
-        for existing in dst.iterdir():
-            if existing != newest and _file_sha256(existing) == sha:
-                newest.unlink()
-                return existing
-    return newest
+    if mp4_files:                     # yt_dlp succeeded
+        newest = max(mp4_files, key=lambda p: p.stat().st_mtime)
+        return newest
+
+    # ---------- Fallback: direct HTTP download ----------
+    try:
+        r = requests.get(url, stream=True, timeout=30)
+        r.raise_for_status()
+        fname = Path(url).name or f"download_{int(time.time())}.mp4"
+        out = dst / fname
+        with out.open("wb") as f:
+            for chunk in r.iter_content(chunk_size=8192):
+                if chunk:
+                    f.write(chunk)
+        # Ensure MP4 extension
+        if out.suffix.lower() != ".mp4":
+            out = _convert_to_mp4(out)
+        return out
+    except Exception as e:
+        raise RuntimeError(
+            f"Unable to download video – yt_dlp and direct download both failed: {e}"
+        )
 
 
 def download_video(url: str, dst: Path, password: str = "") -> Path: