polytool 0.2.6__tar.gz → 0.2.8__tar.gz

{polytool-0.2.6 → polytool-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytool
-Version: 0.2.6
+Version: 0.2.8
 Summary: One-binary CLI bundling 26 everyday utilities — image/video/PDF conversion, background removal, OCR, QR codes, hashing, downloads, and more
 Project-URL: Homepage, https://github.com/k6w/polytool
 Project-URL: Repository, https://github.com/k6w/polytool
@@ -48,6 +48,7 @@ Requires-Dist: pytest-cov>=5; extra == 'dev'
 Requires-Dist: pytest>=8; extra == 'dev'
 Requires-Dist: ruff>=0.5; extra == 'dev'
 Provides-Extra: dl
+Requires-Dist: yt-dlp-ejs>=0.8; extra == 'dl'
 Requires-Dist: yt-dlp>=2024.5; extra == 'dl'
 Provides-Extra: full
 Requires-Dist: ascii-magic>=2; extra == 'full'
@@ -70,6 +71,7 @@ Requires-Dist: pytesseract>=0.3; extra == 'full'
 Requires-Dist: pyzbar>=0.1; extra == 'full'
 Requires-Dist: rembg[cpu]>=2.0; extra == 'full'
 Requires-Dist: resvg-py>=0.1; extra == 'full'
+Requires-Dist: yt-dlp-ejs>=0.8; extra == 'full'
 Requires-Dist: yt-dlp>=2024.5; extra == 'full'
 Provides-Extra: img
 Requires-Dist: ascii-magic>=2; extra == 'img'

{polytool-0.2.6 → polytool-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "polytool"
-version = "0.2.6"
+version = "0.2.8"
 description = "One-binary CLI bundling 26 everyday utilities — image/video/PDF conversion, background removal, OCR, QR codes, hashing, downloads, and more"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -58,7 +58,7 @@ img = [
 ]
 vid = ["ffmpeg-python>=0.2", "imageio-ffmpeg>=0.5"]
 pdf = ["pypdf>=4", "pikepdf>=8", "pdfplumber>=0.11", "pymupdf>=1.24"]
-dl = ["yt-dlp>=2024.5"]
+dl = ["yt-dlp>=2024.5", "yt-dlp-ejs>=0.8"]
 ocr = ["pytesseract>=0.3", "easyocr>=1.7"]
 ai = ["rembg[cpu]>=2.0"]
 qr-decode = ["pyzbar>=0.1"]

{polytool-0.2.6 → polytool-0.2.8}/src/polytool/__init__.py

@@ -1,4 +1,4 @@
 """polytool — one-binary CLI bundling 26 everyday utilities."""
 
-__version__ = "0.2.6"
+__version__ = "0.2.8"
 __all__ = ["__version__"]

{polytool-0.2.6 → polytool-0.2.8}/src/polytool/cli/dl.py

@@ -56,6 +56,13 @@ N_CHALLENGE_PATTERNS = (
     "requested format is not available",
 )
 
+# Patterns that indicate per-session DRM lock — not something we can solve.
+DRM_PATTERNS = (
+    "drm protected",
+    "drm-protected",
+    "experiment that applies drm",
+)
+
 
 _ANSI_RE = re.compile(r"\x1b\[[0-9;]*[A-Za-z]")
 _NOISE_RE = re.compile(
@@ -142,19 +149,56 @@ def _n_challenge_hint(messages: list[str]) -> str | None:
     text = " ".join(messages).lower()
     if not any(p in text for p in N_CHALLENGE_PATTERNS):
         return None
-    return (
-        "YouTube needs a JavaScript runtime to solve its n-challenge.\n\n"
-        "Polytool can manage one for you (no system install needed):\n"
+
+    # When cookies are configured we know we're in a logged-in session — that's
+    # by far the most common cause of these errors (YouTube tightens access for
+    # accounts in their DRM A/B bucket). Try anonymous access first.
+    using_cookies = bool(
+        config.get("dl", "cookies_from_browser") or config.get("dl", "cookies_file")
+    )
+
+    fixes: list[str] = []
+    if using_cookies:
+        fixes.append(
+            "[bold]Most likely fix:[/bold] try without cookies. YouTube often gates "
+            "logged-in sessions into a DRM-only bucket.\n"
+            "  [cyan]pt dl setup --clear[/cyan]    [dim]# forget saved cookies (just for testing)[/dim]\n"
+            "  [cyan]pt dl get URL[/cyan]\n"
+            "If that works, re-save cookies for sites that need them: "
+            "[cyan]pt dl setup --browser firefox[/cyan]"
+        )
+    fixes.append(
+        "If it still fails, make sure a JS runtime is on PATH. Polytool can manage one:\n"
         "  [cyan]pt dl runtime install[/cyan]    "
-        "[dim]# downloads Deno (~50 MB) into ~/.polytool/runtime/[/dim]\n\n"
-        "Then re-run [cyan]pt dl get[/cyan]. The runtime is auto-detected on every call."
+        "[dim]# downloads Deno (~50 MB) into ~/.polytool/runtime/[/dim]"
+    )
+    fixes.append(
+        "Some videos are flagged DRM in your specific YouTube session — those can't "
+        "be downloaded by any tool. Try a different video or account."
+    )
+
+    return "\n\n".join(fixes)
+
+
+def _drm_hint(messages: list[str]) -> str | None:
+    text = " ".join(messages).lower()
+    if not any(p in text for p in DRM_PATTERNS):
+        return None
+    return (
+        "YouTube has flagged this video as DRM-protected for your current session.\n"
+        "This is a per-account / per-session A/B experiment yt-dlp can't bypass.\n\n"
+        "Workarounds (any one usually works):\n"
+        "  • Try without cookies: [cyan]pt dl get URL --cookies-from-browser ''[/cyan]\n"
+        "  • Use a different browser profile: [cyan]pt dl setup --browser chrome[/cyan]\n"
+        "  • Try a different YouTube account.\n"
+        "  • Pick a different video — only some are DRM-flagged in your session."
     )
 
 
 def _hint_for_error(message: str, logger: _DlLogger) -> str | None:
-    """Pick the best hint for a failure: bot-check first, then n-challenge."""
+    """Pick the best hint for a failure: DRM > bot-check > n-challenge."""
     pool = [message, *logger.warnings, *logger.errors]
-    return _bot_check_hint(message) or _n_challenge_hint(pool)
+    return _drm_hint(pool) or _bot_check_hint(message) or _n_challenge_hint(pool)
 
 
 # --------------------------------------------------------------------------- #