devart-dl 4.3.3__tar.gz → 4.3.4__tar.gz

{devart_dl-4.3.3/devart_dl.egg-info → devart_dl-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devart-dl
-Version: 4.3.3
+Version: 4.3.4
 Summary: 专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features
 Author: DeviantArt Downloader Team
 License-Expression: MIT
@@ -94,6 +94,7 @@ devart-dl login browser   # 打开你的 Chrome 登录，自动保存 Cookie，
 - **路径模板 + 元数据 sidecar**：`--directory`/`--filename` 模板与 `--write-info-json`。
 - **代理与降级**：支持 `--proxy`；未登录 OAuth 时自动回退 Cookie。
 - **Resolve 模式**：`devart-dl resolve URL` 输出 `ResolvedDeviation`/`MediaAsset` 的 JSON 契约，不写文件。
+- **付费/订阅锁定识别**：官方 API 返回 `premium_folder_data` / `tier_access`，或网页端非成熟作品的模糊主图（`blur_`），都会识别为「需要订阅/购买」：网页通道跳过，官方通道明确报错，不再把打码图当原图保存。
 
 ## 文档
 

{devart_dl-4.3.3 → devart_dl-4.3.4}/README.en.md

@@ -25,6 +25,7 @@ See [CHANGELOG.md](CHANGELOG.md) for release notes.
 - **Path templates** — `--directory` / `--filename` support `{id}` `{title}` `{author}` `{published}` `{ext}` and more, with safe sanitization.
 - **Metadata sidecars** — `--write-info-json` writes a `.json` next to each file.
 - **Proxy & fallback** — `--proxy` or proxy environment variables; falls back to cookies when not logged in via OAuth.
+- **Paid / subscription-lock detection** — official API `premium_folder_data` / `tier_access`, or a blurred (`blur_`) non-mature main on the web path, is recognised as subscription/purchase-gated: the web path skips it and the official path fails with a clear message instead of saving a censored placeholder.
 
 ---
 

{devart_dl-4.3.3 → devart_dl-4.3.4}/README.md

@@ -60,6 +60,7 @@ devart-dl login browser   # 打开你的 Chrome 登录，自动保存 Cookie，
 - **路径模板 + 元数据 sidecar**：`--directory`/`--filename` 模板与 `--write-info-json`。
 - **代理与降级**：支持 `--proxy`；未登录 OAuth 时自动回退 Cookie。
 - **Resolve 模式**：`devart-dl resolve URL` 输出 `ResolvedDeviation`/`MediaAsset` 的 JSON 契约，不写文件。
+- **付费/订阅锁定识别**：官方 API 返回 `premium_folder_data` / `tier_access`，或网页端非成熟作品的模糊主图（`blur_`），都会识别为「需要订阅/购买」：网页通道跳过，官方通道明确报错，不再把打码图当原图保存。
 
 ## 文档
 

{devart_dl-4.3.3 → devart_dl-4.3.4}/da_downloader/models.py

@@ -29,6 +29,7 @@ class Deviation:
     is_downloadable: bool
     is_mature: bool
     deviation_type: str
+    premium: bool = False
 
     @classmethod
     def from_api_response(cls, data: Dict[str, Any]) -> "Deviation":
@@ -63,6 +64,7 @@ class Deviation:
             ),
             is_mature=bool(data.get("isMature", data.get("is_mature", False))),
             deviation_type=str(deviation_type),
+            premium=_is_locked(data),
         )
 
     def _extract_extension_from_media(self, media: Dict[str, Any]) -> str:
@@ -91,12 +93,25 @@ class Deviation:
         flags = []
         if self.is_mature:
             flags.append("MATURE")
+        if self.premium:
+            flags.append("PREMIUM")
         if self.is_downloadable:
             flags.append("DOWNLOADABLE")
         flag_str = f" [{', '.join(flags)}]" if flags else ""
         return f"{self.title} by {self.author}{flag_str}"
 
 
+def _is_locked(data: Dict[str, Any]) -> bool:
+    """True for premium/subscription-locked works (official/web DTO shapes)."""
+    premium = data.get("premium_folder_data") or data.get("premiumFolderData")
+    if isinstance(premium, dict):
+        access = premium.get("has_access", premium.get("hasAccess"))
+        if access is False:
+            return True
+    tier = data.get("tier_access") or data.get("tierAccess")
+    return tier in ("locked", "locked-subscribed")
+
+
 @dataclass(frozen=True)
 class DownloadItem:
     """A single resolved media file, produced by a provider and consumed by the

{devart_dl-4.3.3 → devart_dl-4.3.4}/da_downloader/official_api.py

@@ -316,6 +316,26 @@ def deviation_uuid(init_data: dict) -> str:
     return uuid
 
 
+def is_locked(deviation: dict) -> bool:
+    """Premium/paid works the current account cannot access.
+
+    The official DTO marks these with ``premium_folder_data.has_access ==
+    False`` or ``tier_access`` locked states (matching DAKit); the web DTO may
+    use the camelCase pair ``premiumFolderData.hasAccess`` / ``tierAccess``.
+    """
+    premium = deviation.get("premium_folder_data") or deviation.get(
+        "premiumFolderData"
+    )
+    if isinstance(premium, dict) and premium.get("has_access", premium.get("hasAccess")) is False:
+        return True
+    tier = deviation.get("tier_access") or deviation.get("tierAccess")
+    return tier in ("locked", "locked-subscribed")
+
+
+def is_blurred(url: str) -> bool:
+    """True when the URL is a censored ``blur_`` Wix transform (mature/paid)."""
+    return "blur_" in url
+
 def additional_media_urls(init_data: dict) -> list:
     """Original-file URLs of a multimedia deviation's extra pages
     (``deviation.extended.additionalMedia``, each entry nests its Wix
@@ -336,7 +356,7 @@ def additional_media_urls(init_data: dict) -> list:
         if not isinstance(media, dict):
             continue
         url = _descriptor_media_url(media)
-        if url and "blur_" not in url:
+        if url and not is_blurred(url):
             urls.append(url)
     return urls
 

{devart_dl-4.3.3 → devart_dl-4.3.4}/da_downloader/provider.py

@@ -20,6 +20,8 @@ from .official_api import (
     additional_media_urls,
     deviation_init,
     deviation_uuid,
+    is_blurred,
+    is_locked,
 )
 from .targets import DownloadTarget, TargetKind
 
@@ -120,6 +122,11 @@ class WebProvider:
         if media_url is None:
             logger.warning("no media URL for %r; skipping", deviation.title)
             return None
+        # 付费/订阅锁定：非成熟作品的模糊主图 = 当前账号拿不到原图，跳过而不是把
+        # 打码图当成作品保存（成熟打码由 official provider / additional pages 处理）。
+        if deviation.premium or (not deviation.is_mature and is_blurred(media_url)):
+            logger.warning("premium/subscription-locked %r; skipping", deviation.title)
+            return None
         return DownloadItem(
             artwork_id=deviation.deviation_id,
             url=deviation.url,
@@ -262,6 +269,8 @@ class OfficialProvider:
             original = self.client.original_download(uuid)
             ext = _ext_from_url(original.filename)
             return original.url, ext
+        url: Optional[str] = None
+        ext: Optional[str] = None
         content = deviation.get("content") or {}
         # `content.src` is a poster for video works; only videos[].src is playable.
         videos = deviation.get("videos") or []
@@ -269,16 +278,27 @@ class OfficialProvider:
             for video in videos:
                 src = video.get("src") if isinstance(video, dict) else None
                 if src:
-                    return str(src), _ext_from_url(str(src))
-        if content.get("src"):
-            return str(content["src"]), _ext_from_url(str(content["src"]))
-        preview = deviation.get("preview") or {}
-        if preview.get("src"):
-            return str(preview["src"]), _ext_from_url(str(preview["src"]))
-        thumbs = deviation.get("thumbs") or []
-        if thumbs and isinstance(thumbs[0], dict) and thumbs[0].get("src"):
-            return str(thumbs[0]["src"]), _ext_from_url(str(thumbs[0]["src"]))
-        raise MediaUnavailableError(f"no media available for deviation {uuid}")
+                    url, ext = str(src), _ext_from_url(str(src))
+                    break
+        if url is None and content.get("src"):
+            url, ext = str(content["src"]), _ext_from_url(str(content["src"]))
+        if url is None:
+            preview = deviation.get("preview") or {}
+            if preview.get("src"):
+                url, ext = str(preview["src"]), _ext_from_url(str(preview["src"]))
+        if url is None:
+            thumbs = deviation.get("thumbs") or []
+            if thumbs and isinstance(thumbs[0], dict) and thumbs[0].get("src"):
+                url, ext = str(thumbs[0]["src"]), _ext_from_url(str(thumbs[0]["src"]))
+        if url is None:
+            raise MediaUnavailableError(f"no media available for deviation {uuid}")
+        # 付费/订阅锁定：非成熟作品的模糊主图（或显式 premium 字段）＝拿不到原图，
+        # 明确报错而不是保存一张打码占位图。成熟作品由 mature_content=true 提供未打码源。
+        if is_locked(deviation) or (not deviation.get("is_mature") and is_blurred(url)):
+            raise MediaUnavailableError(
+                f"deviation {uuid} requires a subscription/purchase (premium)"
+            )
+        return url, ext
 
 
 def _ext_from_url(url: str) -> Optional[str]:

{devart_dl-4.3.3 → devart_dl-4.3.4/devart_dl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devart-dl
-Version: 4.3.3
+Version: 4.3.4
 Summary: 专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features
 Author: DeviantArt Downloader Team
 License-Expression: MIT
@@ -94,6 +94,7 @@ devart-dl login browser   # 打开你的 Chrome 登录，自动保存 Cookie，
 - **路径模板 + 元数据 sidecar**：`--directory`/`--filename` 模板与 `--write-info-json`。
 - **代理与降级**：支持 `--proxy`；未登录 OAuth 时自动回退 Cookie。
 - **Resolve 模式**：`devart-dl resolve URL` 输出 `ResolvedDeviation`/`MediaAsset` 的 JSON 契约，不写文件。
+- **付费/订阅锁定识别**：官方 API 返回 `premium_folder_data` / `tier_access`，或网页端非成熟作品的模糊主图（`blur_`），都会识别为「需要订阅/购买」：网页通道跳过，官方通道明确报错，不再把打码图当原图保存。
 
 ## 文档
 

{devart_dl-4.3.3 → devart_dl-4.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devart-dl"
-version = "4.3.3"
+version = "4.3.4"
 description = "专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features"
 readme = "README.md"
 requires-python = ">=3.10"

{devart_dl-4.3.3 → devart_dl-4.3.4}/tests/test_official_provider.py

@@ -274,6 +274,33 @@ def test_no_media_raises(monkeypatch) -> None:
         list(provider.resolve(TargetParser.parse("123456")))
 
 
+def test_blurred_non_mature_main_raises_premium(monkeypatch) -> None:
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
+    client = FakeClient()
+    client.deviations["uuid-1"] = make_deviation(
+        uuid="uuid-1",
+        content_src="https://images.test/blur_40/full.jpg",
+        is_downloadable=False,
+        mature=False,
+    )
+    provider = OfficialProvider(client, quality="f")
+
+    with pytest.raises(MediaUnavailableError, match="subscription/purchase"):
+        list(provider.resolve(TargetParser.parse("123456")))
+
+
+def test_premium_folder_without_access_raises_premium(monkeypatch) -> None:
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
+    client = FakeClient()
+    deviation = make_deviation(uuid="uuid-1", is_downloadable=False)
+    deviation["premium_folder_data"] = {"has_access": False}
+    client.deviations["uuid-1"] = deviation
+    provider = OfficialProvider(client, quality="f")
+
+    with pytest.raises(MediaUnavailableError, match="subscription/purchase"):
+        list(provider.resolve(TargetParser.parse("123456")))
+
+
 def test_tag_target() -> None:
     client = FakeClient()
     client.pages[("browse_tags", "landscape", 0)] = {

{devart_dl-4.3.3 → devart_dl-4.3.4}/tests/test_provider.py

@@ -74,6 +74,31 @@ def test_gallery_yields_items_with_media_url_and_extension() -> None:
     assert items[0].extension == "png"
 
 
+def test_blurred_non_mature_item_is_skipped() -> None:
+    dev = make_deviation()
+    provider = make_provider(
+        pages=[([dev], False, 1, "")],
+        media_urls={"123": "https://images.test/blur_40/123.jpg"},
+    )
+
+    items = list(provider.resolve(TargetParser.parse("https://www.deviantart.com/alice/gallery")))
+
+    assert items == []
+
+
+def test_premium_locked_item_is_skipped() -> None:
+    dev = make_deviation()
+    dev.premium = True
+    provider = make_provider(
+        pages=[([dev], False, 1, "")],
+        media_urls={"123": "https://images.test/123.jpg"},
+    )
+
+    items = list(provider.resolve(TargetParser.parse("https://www.deviantart.com/alice/gallery")))
+
+    assert items == []
+
+
 def test_pagination_across_two_pages() -> None:
     first = make_deviation("1")
     second = make_deviation("2")