devart-dl 4.0.2__tar.gz → 4.0.4__tar.gz

{devart_dl-4.0.2/devart_dl.egg-info → devart_dl-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devart-dl
-Version: 4.0.2
+Version: 4.0.4
 Summary: 专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features
 Author: DeviantArt Downloader Team
 License-Expression: MIT

{devart_dl-4.0.2 → devart_dl-4.0.4}/da_downloader/official_api.py

@@ -251,4 +251,95 @@ def resolve_uuid(
     return uuid
 
 
-__all__ = ["OfficialApiClient", "OriginalDownload", "resolve_uuid"]
+
+def deviation_init(
+    identifier: str,
+    username: Optional[str] = None,
+    timeout: int = 30,
+    session: Optional[requests.Session] = None,
+) -> dict:
+    """Fetch the full public ``_puppy/dadeviation/init`` payload (numeric or
+    fav.me ids). Mirrors DAKit/DAViewer: multimedia pages surface under
+    ``deviation.extended.additionalMedia`` here, which the official API no
+    longer returns.
+    """
+    identifier = identifier.strip()
+    if not identifier:
+        raise ParseError("the URL does not contain an artwork id")
+    http = session or requests.Session()
+    if not identifier.isdigit():
+        identifier = _resolve_short_id(identifier, http, timeout)
+    try:
+        home = http.get(
+            WEB_BASE,
+            headers={"User-Agent": USER_AGENT, "Accept": "text/html"},
+            timeout=timeout,
+        )
+        home.raise_for_status()
+        match = re.search(r"window\.__CSRF_TOKEN__ = '([^']*)'", home.text)
+        if not match or not match.group(1):
+            raise ParseError("could not read the DeviantArt CSRF token")
+        csrf = match.group(1)
+        query = {
+            "deviationid": identifier,
+            # 该接口自 2026 年起把 type 列为必填枚举（art/journal），缺失返回 400。
+            "type": "art",
+            "include_session": "false",
+            "csrf_token": csrf,
+            "mature_content": True,
+        }
+        if username:
+            query["username"] = username
+        response = http.get(
+            f"{WEB_BASE}/_puppy/dadeviation/init",
+            params=query,
+            headers={"User-Agent": USER_AGENT, "Accept": "application/json"},
+            timeout=timeout,
+        )
+        response.raise_for_status()
+        data = response.json()
+    except requests.RequestException as error:
+        raise NetworkError(f"could not reach the resolution endpoint: {error}") from error
+    except ValueError as error:
+        raise ParseError("the resolution endpoint returned invalid JSON") from error
+    if not isinstance(data, dict) or not isinstance(data.get("deviation"), dict):
+        raise ParseError("the resolution endpoint returned an unexpected payload")
+    return data
+
+
+def deviation_uuid(init_data: dict) -> str:
+    """Read the UUID out of an init payload."""
+    extended = init_data.get("deviation", {}).get("extended") or {}
+    uuid = extended.get("deviationUuid")
+    if not isinstance(uuid, str) or not uuid:
+        raise MediaUnavailableError("could not resolve the artwork to a UUID")
+    return uuid
+
+
+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
+    descriptor under ``media``). Prefers the raw ``baseUri`` file + token.
+    """
+    extended = init_data.get("deviation", {}).get("extended") or {}
+    entries = extended.get("additionalMedia") or []
+    urls: list = []
+    for entry in entries:
+        if not isinstance(entry, dict):
+            continue
+        media = entry.get("media")
+        if not isinstance(media, dict):
+            continue
+        base = media.get("baseUri")
+        if not isinstance(base, str) or not base:
+            continue
+        raw_token = media.get("token")
+        token = raw_token[0] if isinstance(raw_token, list) and raw_token else raw_token
+        if token:
+            urls.append(f"{base}{'&' if '?' in base else '?'}token={token}")
+        else:
+            urls.append(base)
+    return urls
+
+
+__all__ = ["OfficialApiClient", "OriginalDownload", "resolve_uuid", "deviation_init", "deviation_uuid", "additional_media_urls"]

{devart_dl-4.0.2 → devart_dl-4.0.4}/da_downloader/provider.py

@@ -14,7 +14,12 @@ from typing import Any, Callable, Iterator, Optional, Protocol
 from .api import ActionType, DeviantArtAPI
 from .errors import MediaUnavailableError, ParseError
 from .models import Deviation, DownloadItem
-from .official_api import OfficialApiClient, resolve_uuid
+from .official_api import (
+    OfficialApiClient,
+    additional_media_urls,
+    deviation_init,
+    deviation_uuid,
+)
 from .targets import DownloadTarget, TargetKind
 
 logger = logging.getLogger(__name__)
@@ -158,7 +163,7 @@ class OfficialProvider:
     def resolve(self, target: DownloadTarget) -> Iterator[DownloadItem]:
         kind = target.kind
         if kind == TargetKind.ARTWORK:
-            yield self._artwork(target)
+            yield from self._artwork_items(target)
             return
         if kind == TargetKind.SEARCH:
             raise MediaUnavailableError(
@@ -191,8 +196,31 @@ class OfficialProvider:
         yield from self._paginate(fetch)
 
     def _artwork(self, target: DownloadTarget) -> DownloadItem:
-        uuid = resolve_uuid(target.identifier or "", target.username)
-        return self._item(self.client.deviation(uuid))
+        # 兼容旧的单返回值调用（resolve 里已改用 _artwork_items）
+        return next(self._artwork_items(target))
+
+    def _artwork_items(self, target: DownloadTarget) -> Iterator[DownloadItem]:
+        """单作品下载。多文件作品的附加画面来自网页 init 响应
+        （deviation.extended.additionalMedia，官方 API 不再返回），逐个产出下载项；
+        没有附加画面时只下主图（行为与以前一致）。"""
+        identifier = target.identifier or ""
+        init_data = deviation_init(identifier, target.username)
+        uuid = deviation_uuid(init_data)
+        main = self._item(self.client.deviation(uuid))
+        yield main
+        for index, url in enumerate(additional_media_urls(init_data), start=1):
+            item = DownloadItem(
+                artwork_id=f"{main.artwork_id}-{index}",
+                url=main.url,
+                title=main.title,
+                author=main.author,
+                media_url=url,
+                extension=_ext_from_url(url),
+                published_at=main.published_at,
+                mature=main.mature,
+                metadata={**main.metadata, "index": index},
+            )
+            yield item
 
     def _paginate(self, fetch: Callable[[int], dict]) -> Iterator[DownloadItem]:
         offset = 0

{devart_dl-4.0.2 → devart_dl-4.0.4/devart_dl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devart-dl
-Version: 4.0.2
+Version: 4.0.4
 Summary: 专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features
 Author: DeviantArt Downloader Team
 License-Expression: MIT

{devart_dl-4.0.2 → devart_dl-4.0.4}/pyproject.toml

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

{devart_dl-4.0.2 → devart_dl-4.0.4}/tests/test_official_provider.py

@@ -58,7 +58,7 @@ class FakeClient:
 
 
 def test_artwork_original(monkeypatch) -> None:
-    monkeypatch.setattr(provider_mod, "resolve_uuid", lambda identifier, username=None: "uuid-1")
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()
     client.deviations["uuid-1"] = make_deviation()
     client.originals["uuid-1"] = OriginalDownload(
@@ -77,8 +77,35 @@ def test_artwork_original(monkeypatch) -> None:
     assert items[0].published_at == datetime(2015, 3, 30, 21, 21, 4, tzinfo=timezone.utc)
 
 
+def test_artwork_multimedia_yields_every_file(monkeypatch) -> None:
+    init = {
+        "deviation": {
+            "extended": {
+                "deviationUuid": "uuid-1",
+                "additionalMedia": [
+                    {"fileId": 2, "media": {"baseUri": "https://media.test/p2.jpg", "token": ["t2"]}},
+                    {"fileId": 3, "media": {"baseUri": "https://media.test/p3.png", "token": ["t3"]}},
+                ],
+            }
+        }
+    }
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: init)
+    client = FakeClient()
+    client.deviations["uuid-1"] = make_deviation()
+    provider = OfficialProvider(client, quality="f")
+
+    items = list(provider.resolve(TargetParser.parse("https://www.deviantart.com/alice/art/x-123456")))
+
+    assert len(items) == 3  # 主图 + 两张附加
+    assert items[0].media_url == "https://images.test/full.jpg"
+    assert items[1].media_url == "https://media.test/p2.jpg?token=t2"
+    assert items[1].artwork_id == "uuid-1-1"
+    assert items[2].media_url == "https://media.test/p3.png?token=t3"
+    assert items[2].extension == "png"
+
+
 def test_artwork_best_uses_content(monkeypatch) -> None:
-    monkeypatch.setattr(provider_mod, "resolve_uuid", lambda identifier, username=None: "uuid-1")
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()
     client.deviations["uuid-1"] = make_deviation()
     provider = OfficialProvider(client, quality="f")
@@ -111,7 +138,7 @@ def test_gallery_paginates(monkeypatch) -> None:
 
 
 def test_no_media_raises(monkeypatch) -> None:
-    monkeypatch.setattr(provider_mod, "resolve_uuid", lambda identifier, username=None: "uuid-1")
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()
     client.deviations["uuid-1"] = {
         "deviationid": "uuid-1",