ytp-dl 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

scripts/api.py

@@ -20,9 +20,9 @@ MAX_CONCURRENT = int(os.environ.get("YTPDL_MAX_CONCURRENT", "1"))
 _sem = Semaphore(MAX_CONCURRENT)
 
 # Failsafe: delete abandoned job dirs older than this many seconds.
-# (keep 21600 if you prefer; 3600 is fine too)
 STALE_JOB_TTL_S = int(os.environ.get("YTPDL_STALE_JOB_TTL_S", "3600"))
 
+# extension is now a "mode": mp3 | mp4 | best
 _ALLOWED_EXTENSIONS = {"mp3", "mp4", "best"}
 
 
@@ -63,8 +63,6 @@ def handle_download():
         data = request.get_json(force=True)
         url = (data.get("url") or "").strip()
         resolution = data.get("resolution")
-
-        # extension is now a "mode": mp3 | mp4 | best
         extension = (data.get("extension") or "mp4").strip().lower()
 
         if not url:
@@ -91,7 +89,6 @@ def handle_download():
             raise RuntimeError("Download failed")
 
         # Release semaphore as soon as yt-dlp is done.
-        # Streaming the file should not block the next download job.
         _release_once()
 
         response = send_file(filename, as_attachment=True)
@@ -111,11 +108,7 @@ def handle_download():
         if job_dir:
             shutil.rmtree(job_dir, ignore_errors=True)
         _release_once()
-
-        msg = str(e)
-        if "Mullvad not logged in" in msg:
-            return jsonify(error=msg), 503
-        return jsonify(error=f"Download failed: {msg}"), 500
+        return jsonify(error=f"Download failed: {str(e)}"), 500
 
     except Exception as e:
         if job_dir:

scripts/downloader.py

@@ -5,15 +5,13 @@ import os
 import shlex
 import shutil
 import subprocess
-import time
 from typing import Optional, List, Tuple
 
 # =========================
 # Config / constants
 # =========================
-VENV_PATH = os.environ.get("YTPDL_VENV", "/opt/yt-dlp-mullvad/venv")
+VENV_PATH = os.environ.get("YTPDL_VENV", "/opt/ytpdl/venv")
 YTDLP_BIN = os.path.join(VENV_PATH, "bin", "yt-dlp")
-MULLVAD_LOCATION = os.environ.get("YTPDL_MULLVAD_LOCATION", "us")
 
 MODERN_UA = os.environ.get(
     "YTPDL_USER_AGENT",
@@ -22,6 +20,11 @@ MODERN_UA = os.environ.get(
     "Chrome/124.0.0.0 Safari/537.36",
 )
 
+# Optional: explicitly pin a JS runtime (useful if systemd PATH is odd).
+# Example: YTPDL_JS_RUNTIMES="deno:/usr/local/bin/deno"
+# Deno is enabled by default in yt-dlp; supplying a path is optional.  :contentReference[oaicite:3]{index=3}
+JS_RUNTIMES = os.environ.get("YTPDL_JS_RUNTIMES", "").strip()
+
 FFMPEG_BIN = shutil.which("ffmpeg") or "ffmpeg"
 DEFAULT_OUT_DIR = os.environ.get("YTPDL_DOWNLOAD_DIR", "/root")
 
@@ -60,13 +63,8 @@ def _tail(out: str) -> str:
     return txt.strip()
 
 
-def _is_youtube_url(url: str) -> bool:
-    u = (url or "").lower()
-    return any(h in u for h in ("youtube.com", "youtu.be", "youtube-nocookie.com"))
-
-
 # =========================
-# Environment / Mullvad
+# Environment checks
 # =========================
 def validate_environment() -> None:
     if not os.path.exists(YTDLP_BIN):
@@ -75,59 +73,12 @@ def validate_environment() -> None:
         raise RuntimeError("ffmpeg not found on PATH")
 
 
-def _mullvad_present() -> bool:
-    return shutil.which("mullvad") is not None
-
-
-def mullvad_logged_in() -> bool:
-    if not _mullvad_present():
-        return False
-    res = subprocess.run(
-        ["mullvad", "account", "get"],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        text=True,
-    )
-    return "not logged in" not in (res.stdout or "").lower()
-
-
-def require_mullvad_login() -> None:
-    if _mullvad_present() and not mullvad_logged_in():
-        raise RuntimeError("Mullvad not logged in. Run: mullvad account login <ACCOUNT>")
-
-
-def mullvad_connect(location: Optional[str] = None) -> None:
-    if not _mullvad_present():
-        return
-    loc = (location or MULLVAD_LOCATION).strip()
-    _run_argv(["mullvad", "disconnect"], check=False)
-    if loc:
-        _run_argv(["mullvad", "relay", "set", "location", loc], check=False)
-    _run_argv(["mullvad", "connect"], check=False)
-
-
-def mullvad_wait_connected(timeout: int = 20) -> bool:
-    if not _mullvad_present():
-        return True
-    for _ in range(timeout):
-        res = subprocess.run(
-            ["mullvad", "status"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            text=True,
-        )
-        if "Connected" in (res.stdout or ""):
-            return True
-        time.sleep(1)
-    return False
-
-
 # =========================
 # yt-dlp helpers
 # =========================
 def _common_flags() -> List[str]:
     # --no-playlist prevents accidental channel/playlist pulls (and disk blowups)
-    return [
+    flags = [
         "--no-playlist",
         "--retries", "10",
         "--fragment-retries", "10",
@@ -139,6 +90,13 @@ def _common_flags() -> List[str]:
         "--sleep-interval", "1",
     ]
 
+    # If you want to hard-pin deno (or any runtime), set YTPDL_JS_RUNTIMES.
+    # Example: deno:/usr/local/bin/deno  :contentReference[oaicite:4]{index=4}
+    if JS_RUNTIMES:
+        flags.extend(["--js-runtimes", JS_RUNTIMES])
+
+    return flags
+
 
 def _extract_final_path(stdout: str, out_dir: str) -> Optional[str]:
     """
@@ -257,7 +215,6 @@ def _download_with_format(
     ]
 
     if extract_mp3:
-        # Force audio extraction to MP3 (requires ffmpeg)
         argv.extend(["--extract-audio", "--audio-format", "mp3"])
 
     # Only force merge container when we actually want MP4 output.
@@ -309,55 +266,44 @@ def download_video(
 
     validate_environment()
 
-    require_mullvad_login()
-    mullvad_connect(MULLVAD_LOCATION)
-    if not mullvad_wait_connected():
-        raise RuntimeError("Mullvad connection failed")
+    mode = (extension or "mp4").lower().strip()
 
-    try:
-        mode = (extension or "mp4").lower().strip()
+    if mode == "mp3":
+        return _download_with_format(
+            url=url,
+            out_dir=out_dir,
+            fmt="bestaudio",
+            merge_output_format=None,
+            extract_mp3=True,
+        )
+
+    cap = int(resolution or 1080)
 
-        if mode == "mp3":
-            # bestaudio -> ffmpeg -> mp3 (post-processed by yt-dlp)
+    if mode == "best":
+        # Try best first (may produce webm/mkv/etc).
+        try:
             return _download_with_format(
                 url=url,
                 out_dir=out_dir,
-                fmt="bestaudio",
+                fmt=_fmt_best(cap),
                 merge_output_format=None,
-                extract_mp3=True,
+                extract_mp3=False,
+            )
+        except Exception:
+            # If best fails, fall back to Apple-safe MP4.
+            return _download_with_format(
+                url=url,
+                out_dir=out_dir,
+                fmt=_fmt_mp4_apple_safe(cap),
+                merge_output_format="mp4",
+                extract_mp3=False,
             )
 
-        cap = int(resolution or 1080)
-
-        if mode == "best":
-            # Try best first (may produce webm/mkv/etc).
-            try:
-                return _download_with_format(
-                    url=url,
-                    out_dir=out_dir,
-                    fmt=_fmt_best(cap),
-                    merge_output_format=None,
-                    extract_mp3=False,
-                )
-            except Exception:
-                # If best fails for any reason, fall back to Apple-safe MP4.
-                return _download_with_format(
-                    url=url,
-                    out_dir=out_dir,
-                    fmt=_fmt_mp4_apple_safe(cap),
-                    merge_output_format="mp4",
-                    extract_mp3=False,
-                )
-
-        # Default / "mp4" mode: force Apple-safe MP4 up to cap.
-        return _download_with_format(
-            url=url,
-            out_dir=out_dir,
-            fmt=_fmt_mp4_apple_safe(cap),
-            merge_output_format="mp4",
-            extract_mp3=False,
-        )
-
-    finally:
-        if _mullvad_present():
-            _run_argv(["mullvad", "disconnect"], check=False)
+    # Default / "mp4" mode: force Apple-safe MP4 up to cap.
+    return _download_with_format(
+        url=url,
+        out_dir=out_dir,
+        fmt=_fmt_mp4_apple_safe(cap),
+        merge_output_format="mp4",
+        extract_mp3=False,
+    )

{ytp_dl-0.6.0.dist-info → ytp_dl-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ytp-dl
-Version: 0.6.0
+Version: 0.6.2
 Summary: YouTube video downloader with Mullvad VPN integration and Flask API
 Home-page: https://github.com/yourusername/ytp-dl
 Author: dumgum82
@@ -34,37 +34,35 @@ Dynamic: summary
 
 # ytp-dl
 
-> A lightweight YouTube downloader with Mullvad VPN integration and HTTP API
+> A lightweight YouTube downloader with an HTTP API
 
 [![PyPI version](https://img.shields.io/pypi/v/ytp-dl.svg)](https://pypi.org/project/ytp-dl/)
 [![Python Support](https://img.shields.io/pypi/pyversions/ytp-dl.svg)](https://pypi.org/project/ytp-dl/)
 [![License](https://img.shields.io/pypi/l/ytp-dl.svg)](https://pypi.org/project/ytp-dl/)
 [![Downloads](https://img.shields.io/pypi/dm/ytp-dl.svg)](https://pypi.org/project/ytp-dl/)
 
-**ytp-dl** is a privacy-focused YouTube downloader that automatically routes downloads through Mullvad VPN via an HTTP API.
+**ytp-dl** is a privacy-focused YouTube downloader that exposes a simple HTTP API for automated downloads.
 
 ---
 
-## ✨ Features
+## Features
 
-* 🔒 **Privacy First** — Automatically connects/disconnects Mullvad VPN per download
-* 🎥 **Smart Quality Selection** — Prefers 1080p H.264 + AAC (no transcoding needed)
-* 🎵 **Audio Downloads** — Extract audio as MP3
-* 🚀 **HTTP API** — Simple Flask-based API with concurrency controls
-* ⚡ **VPS Ready** — Includes automated installer script for Ubuntu
+* Smart quality selection (prefers 1080p H.264 + AAC when available; no transcoding needed)
+* Audio downloads (extract audio as MP3)
+* HTTP API (Flask-based API with concurrency controls)
+* VPS-ready (includes an automated installer script for Ubuntu)
 
 ---
 
-## 📦 Installation
+## Installation
 
 ```bash
-pip install ytp-dl==0.6.0 yt-dlp[default]
+pip install ytp-dl==0.6.2 yt-dlp[default]
 ```
 
 **Requirements:**
 
 * Linux operating system (tested on Ubuntu 24.04/25.04)
-* [Mullvad CLI](https://mullvad.net/en/download/vpn/linux) installed and configured
 * FFmpeg (for handling audio + video)
 * Deno (system-wide, required by yt-dlp for modern YouTube extraction)
 * Python 3.8+
@@ -75,7 +73,7 @@ Notes:
 
 ---
 
-## 🎯 Using Your VPS
+## Using Your VPS
 
 Once your VPS is running, you can download videos using simple HTTP requests:
 
@@ -140,34 +138,26 @@ else:
 
 ---
 
-## ⚙️ Configuration
+## Configuration
 
 ### Installation Script Variables
 
 These environment variables configure the VPS installation (they can be overridden when running the script):
 
-| Variable                 | Description                             | Default               |
-| ------------------------ | --------------------------------------- | --------------------- |
-| `PORT`                   | API server port                         | `5000`                |
-| `APP_DIR`                | Installation directory                  | `/opt/yt-dlp-mullvad` |
-| `MV_ACCOUNT`             | Mullvad account number                  | your mullvad id       |
-| `YTPDL_MAX_CONCURRENT`   | Max simultaneous downloads (API cap)    | `1`                   |
-| `YTPDL_MULLVAD_LOCATION` | Mullvad relay location code (e.g. `us`) | `us`                  |
-
-Notes:
-
-* If `MV_ACCOUNT` is set, the installer attempts `mullvad account login <MV_ACCOUNT>` once.
-* If `MV_ACCOUNT` is left empty, the script skips login and assumes Mullvad is already configured.
+| Variable               | Description                          | Default            |
+| ---------------------- | ------------------------------------ | ------------------ |
+| `PORT`                 | API server port                      | `5000`             |
+| `APP_DIR`              | Installation directory               | `/opt/ytp-dl`      |
+| `YTPDL_MAX_CONCURRENT` | Max simultaneous downloads (API cap) | `1`                |
 
 ### Runtime Environment Variables
 
 After installation, these variables control the API behavior. They are set in `/etc/default/ytp-dl-api` and can be edited manually:
 
-| Variable                 | Description                   | Default                    |
-| ------------------------ | ----------------------------- | -------------------------- |
-| `YTPDL_MAX_CONCURRENT`   | Maximum concurrent downloads  | `1`                        |
-| `YTPDL_MULLVAD_LOCATION` | Mullvad relay location code   | `us`                       |
-| `YTPDL_VENV`             | Path to virtualenv for ytp-dl | `/opt/yt-dlp-mullvad/venv` |
+| Variable               | Description                     | Default               |
+| ---------------------- | ------------------------------- | --------------------- |
+| `YTPDL_MAX_CONCURRENT` | Maximum concurrent downloads    | `1`                   |
+| `YTPDL_VENV`           | Path to virtualenv for ytp-dl   | `/opt/ytp-dl/venv`    |
 
 To change configuration after installation:
 
@@ -178,7 +168,7 @@ sudo systemctl restart ytp-dl-api
 
 ---
 
-## 🔧 Managing Your VPS Service
+## Managing Your VPS Service
 
 ### View Service Status
 
@@ -207,7 +197,7 @@ sudo systemctl start ytp-dl-api
 
 ---
 
-## 📋 API Reference
+## API Reference
 
 ### POST `/api/download`
 
@@ -242,60 +232,45 @@ sudo systemctl start ytp-dl-api
 
 ---
 
-## 🖥️ VPS Deployment
+## VPS Deployment
 
 **What it does:**
 
-* ✅ Installs Python, FFmpeg, and Mullvad CLI
-* ✅ Installs Deno system-wide (required by yt-dlp for modern YouTube extraction)
-* ✅ Creates virtualenv at `/opt/yt-dlp-mullvad/venv`
-* ✅ Installs `ytp-dl==0.6.0` + `yt-dlp[default]` into the virtualenv
-* ✅ Sets up systemd service on port 5000
-* ✅ Configures Gunicorn with gevent workers
+* Installs Python and FFmpeg
+* Installs Deno system-wide (required by yt-dlp for modern YouTube extraction)
+* Creates a virtualenv at `/opt/ytp-dl/venv`
+* Installs `ytp-dl==0.6.2` + `yt-dlp[default]` into the virtualenv
+* Sets up a systemd service on port 5000
+* Configures Gunicorn with gevent workers
 
 ```bash
 #!/usr/bin/env bash
-# VPS_Installation.sh - Minimal Ubuntu 24.04/25.04 setup for ytp-dl API + Mullvad
+# VPS_Installation.sh - Minimal Ubuntu 24.04/25.04 setup for ytp-dl API
 #
 # What this does:
-#   - Installs Python, ffmpeg, Mullvad CLI
+#   - Installs Python + ffmpeg
 #   - Installs Deno system-wide (JS runtime required for modern YouTube extraction via yt-dlp)
-#   - Creates a virtualenv at /opt/yt-dlp-mullvad/venv
-#   - Installs ytp-dl==0.6.0 + yt-dlp[default] + gunicorn + gevent in that venv
+#   - Creates a virtualenv at /opt/ytp-dl/venv
+#   - Installs ytp-dl==0.6.2 + yt-dlp[default] + gunicorn + gevent in that venv
 #   - Creates a simple systemd service ytp-dl-api.service on port 5000
-#
-# Mullvad connect/disconnect is handled per-job by downloader.py.
 
 set -euo pipefail
 
 ### --- Tunables -------------------------------------------------------------
-PORT="${PORT:-5000}"                           # API listen port
-APP_DIR="${APP_DIR:-/opt/yt-dlp-mullvad}"      # app/venv root
-VENV_DIR="${VENV_DIR:-${APP_DIR}/venv}"        # python venv
+PORT="${PORT:-5000}"                      # API listen port
+APP_DIR="${APP_DIR:-/opt/ytp-dl}"         # app/venv root
+VENV_DIR="${VENV_DIR:-${APP_DIR}/venv}"   # python venv
 
-MV_ACCOUNT="${MV_ACCOUNT:-}"                   # Mullvad account (put number after -)
-YTPDL_MAX_CONCURRENT="${YTPDL_MAX_CONCURRENT:-1}"        # API concurrency cap
-YTPDL_MULLVAD_LOCATION="${YTPDL_MULLVAD_LOCATION:-us}"   # default Mullvad relay hint
+YTPDL_MAX_CONCURRENT="${YTPDL_MAX_CONCURRENT:-1}"     # API concurrency cap
 ### -------------------------------------------------------------------------
 
 [[ "${EUID}" -eq 0 ]] || { echo "Please run as root"; exit 1; }
 export DEBIAN_FRONTEND=noninteractive
 
-echo "==> 1) Base packages & Mullvad CLI"
+echo "==> 1) Base packages"
 apt-get update
-apt-get install -yq --no-install-recommends   python3-venv python3-pip curl ffmpeg ca-certificates unzip
-
-if ! command -v mullvad >/dev/null 2>&1; then
-  curl -fsSLo /tmp/mullvad.deb https://mullvad.net/download/app/deb/latest/
-  apt-get install -y /tmp/mullvad.deb
-fi
-
-if [[ -n "${MV_ACCOUNT}" ]]; then
-  echo "Logging into Mullvad account (if not already logged in)..."
-  mullvad account login "${MV_ACCOUNT}" || true
-fi
-
-mullvad status || true
+apt-get install -yq --no-install-recommends \
+  python3-venv python3-pip curl ffmpeg ca-certificates unzip
 
 echo "==> 1.5) Install Deno (system-wide, for yt-dlp YouTube extraction)"
 # Install into /usr/local/bin/deno so systemd PATH can see it.
@@ -310,20 +285,19 @@ mkdir -p "${APP_DIR}"
 python3 -m venv "${VENV_DIR}"
 source "${VENV_DIR}/bin/activate"
 pip install --upgrade pip
-pip install "ytp-dl==0.6.0" "yt-dlp[default]" gunicorn gevent
+pip install "ytp-dl==0.6.2" "yt-dlp[default]" gunicorn gevent
 deactivate
 
 echo "==> 3) API environment file (/etc/default/ytp-dl-api)"
 tee /etc/default/ytp-dl-api >/dev/null <<EOF
 YTPDL_MAX_CONCURRENT=${YTPDL_MAX_CONCURRENT}
-YTPDL_MULLVAD_LOCATION=${YTPDL_MULLVAD_LOCATION}
 YTPDL_VENV=${VENV_DIR}
 EOF
 
 echo "==> 4) Gunicorn systemd service (ytp-dl-api.service on :${PORT})"
 tee /etc/systemd/system/ytp-dl-api.service >/dev/null <<EOF
 [Unit]
-Description=Gunicorn for ytp-dl Mullvad API (minimal)
+Description=Gunicorn for ytp-dl API (minimal)
 After=network-online.target
 Wants=network-online.target
 
@@ -334,7 +308,9 @@ EnvironmentFile=/etc/default/ytp-dl-api
 Environment=VIRTUAL_ENV=${VENV_DIR}
 Environment=PATH=${VENV_DIR}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 
-ExecStart=${VENV_DIR}/bin/gunicorn -k gevent -w 1   --worker-connections 200 --timeout 0 --graceful-timeout 15 --keep-alive 20   --bind 0.0.0.0:${PORT} scripts.api:app
+ExecStart=${VENV_DIR}/bin/gunicorn -k gevent -w 1 \
+  --worker-connections 200 --timeout 0 --graceful-timeout 15 --keep-alive 20 \
+  --bind 0.0.0.0:${PORT} scripts.api:app
 
 Restart=always
 RestartSec=3

ytp_dl-0.6.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+scripts/__init__.py,sha256=EbAplfCcyLD3Q_9sxemm6owCc5_UJv53vmlxy810p2s,152
+scripts/api.py,sha256=K-4iwgj6W4Gx8y3mzBe_CP4Ua9Ky9quESOqcw6BpNv0,3713
+scripts/downloader.py,sha256=NGW1TmPmjHCTlN1uUNYwhSBm1c7UotkF8Pn9Q0dxqLk,9227
+ytp_dl-0.6.2.dist-info/METADATA,sha256=7U33Y4moFmjs1xivWbR3_xGe5imTbGFlecFx6BI63os,9754
+ytp_dl-0.6.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ytp_dl-0.6.2.dist-info/entry_points.txt,sha256=QqjqZZAEt3Y7RGrleqZ312sjjboUpbMLdo7qFxuCH30,48
+ytp_dl-0.6.2.dist-info/top_level.txt,sha256=rmzd5mewlrJy4sT608KPib7sM7edoY75AeqJeY3SPB4,8
+ytp_dl-0.6.2.dist-info/RECORD,,

ytp_dl-0.6.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-scripts/__init__.py,sha256=EbAplfCcyLD3Q_9sxemm6owCc5_UJv53vmlxy810p2s,152
-scripts/api.py,sha256=EmTmzhpElx5QaJJ5z8GiimJTVZOHRoKhcReIRUCShBg,3943
-scripts/downloader.py,sha256=vvHasu-41DGPDUzOTA4kz52tijTkaii1NnuU4cHQxg8,10825
-ytp_dl-0.6.0.dist-info/METADATA,sha256=3779KleCiYQVmOhwhPj5SYudvuESfW-Cvz7boCYk7c8,11342
-ytp_dl-0.6.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ytp_dl-0.6.0.dist-info/entry_points.txt,sha256=QqjqZZAEt3Y7RGrleqZ312sjjboUpbMLdo7qFxuCH30,48
-ytp_dl-0.6.0.dist-info/top_level.txt,sha256=rmzd5mewlrJy4sT608KPib7sM7edoY75AeqJeY3SPB4,8
-ytp_dl-0.6.0.dist-info/RECORD,,