devart-dl 4.3.1__tar.gz → 4.3.2__tar.gz

{devart_dl-4.3.1/devart_dl.egg-info → devart_dl-4.3.2}/PKG-INFO

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

{devart_dl-4.3.1 → devart_dl-4.3.2}/da_downloader/official_api.py

@@ -319,32 +319,67 @@ def deviation_uuid(init_data: dict) -> str:
 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.
+    descriptor under ``media``). Mirrors DeviantDrop's pick order: a playable
+    video ``types[].b`` (best quality) wins over ``baseUri`` — a video page's
+    baseUri is its poster — then the ``baseUri`` file itself, then a
+    fullview template. A page whose only representation is a small preview is
+    skipped rather than saved as a fake original.
 
     Mature pages the server still returns with a ``blur_`` censored image are
     skipped individually; one blocked page does not discard the others.
     """
-    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")
+    for entry in (init_data.get("deviation", {}).get("extended") or {}).get(
+        "additionalMedia"
+    ) or []:
+        media = entry.get("media") if isinstance(entry, dict) else None
         if not isinstance(media, dict):
             continue
-        base = media.get("baseUri")
-        if not isinstance(base, str) or not base:
-            continue
-        if "blur_" in 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)
+        url = _descriptor_media_url(media)
+        if url and "blur_" not in url:
+            urls.append(url)
     return urls
 
 
+_FILE_EXT_RE = re.compile(
+    r"\.(?:png|jpe?g|gif|webp|avif|mp4|m4v|webm|mov|mkv)$", re.IGNORECASE
+)
+_VIDEO_QUALITY_RANK = {"1080p": 4, "720p": 3, "480p": 2, "360p": 1}
+
+
+def _descriptor_media_url(media: dict) -> Optional[str]:
+    types = media.get("types")
+    types = types if isinstance(types, list) else []
+    videos = [
+        item
+        for item in types
+        if isinstance(item, dict) and item.get("t") == "video" and item.get("b")
+    ]
+    if videos:
+        best = max(videos, key=lambda item: _VIDEO_QUALITY_RANK.get(item.get("q"), 0))
+        return _append_token(str(best["b"]), media.get("token"))
+    base = media.get("baseUri")
+    if isinstance(base, str) and base and _FILE_EXT_RE.search(base.split("?", 1)[0]):
+        return _append_token(base, media.get("token"))
+    fullview = next(
+        (item for item in types if isinstance(item, dict) and item.get("t") == "fullview"),
+        None,
+    )
+    if fullview:
+        if fullview.get("b"):
+            return _append_token(str(fullview["b"]), media.get("token"))
+        if fullview.get("c") and isinstance(base, str) and base:
+            pretty = media.get("prettyName") or "image"
+            url = base + str(fullview["c"]).replace("<prettyName>", pretty)
+            return _append_token(url, media.get("token"))
+    return None
+
+
+def _append_token(url: str, raw_token: Any) -> str:
+    token = raw_token[0] if isinstance(raw_token, list) and raw_token else raw_token
+    if not token:
+        return url
+    return f"{url}{'&' if '?' in url else '?'}token={token}"
+
+
 __all__ = ["OfficialApiClient", "OriginalDownload", "resolve_uuid", "deviation_init", "deviation_uuid", "additional_media_urls"]

{devart_dl-4.3.1 → devart_dl-4.3.2/devart_dl.egg-info}/PKG-INFO

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

{devart_dl-4.3.1 → devart_dl-4.3.2}/pyproject.toml

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

{devart_dl-4.3.1 → devart_dl-4.3.2}/tests/test_official_provider.py

@@ -129,6 +129,88 @@ def test_mature_blurred_extra_pages_are_skipped(monkeypatch) -> None:
     ]
 
 
+def test_extra_video_page_uses_playable_source_not_poster(monkeypatch) -> None:
+    init = {
+        "deviation": {
+            "extended": {
+                "deviationUuid": "uuid-1",
+                "additionalMedia": [
+                    {"media": {
+                        "baseUri": "https://media.test/page2.jpg",
+                        "types": [
+                            {"t": "video", "q": "480p", "b": "https://videos.test/p2-480.mp4"},
+                            {"t": "video", "q": "1080p", "b": "https://videos.test/p2-1080.mp4"},
+                        ],
+                        "token": "t",
+                    }},
+                ],
+            }
+        }
+    }
+    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("123456")))
+
+    assert items[1].media_url == "https://videos.test/p2-1080.mp4?token=t"
+    assert items[1].extension == "mp4"
+
+
+def test_extra_page_uses_fullview_template_when_baseuri_is_not_a_file(monkeypatch) -> None:
+    init = {
+        "deviation": {
+            "extended": {
+                "deviationUuid": "uuid-1",
+                "additionalMedia": [
+                    {"media": {
+                        "baseUri": "https://wixmp.test/hashed",
+                        "fullview": True,
+                        "types": [{"t": "fullview", "c": "/f/<prettyName>.jpg"}],
+                        "prettyName": "page2",
+                        "token": "t",
+                    }},
+                ],
+            }
+        }
+    }
+    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("123456")))
+
+    assert items[1].media_url == "https://wixmp.test/hashed/f/page2.jpg?token=t"
+
+
+def test_preview_only_extra_page_is_skipped_not_downgraded(monkeypatch) -> None:
+    init = {
+        "deviation": {
+            "extended": {
+                "deviationUuid": "uuid-1",
+                "additionalMedia": [
+                    {"media": {
+                        "baseUri": "https://wixmp.test/hashed",
+                        "types": [{"t": "preview", "c": "/f/<prettyName>.jpg"}],
+                        "prettyName": "page2",
+                        "token": "t",
+                    }},
+                ],
+            }
+        }
+    }
+    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("123456")))
+
+    assert [item.media_url for item in items] == ["https://images.test/full.jpg"]
+
+
 def test_artwork_best_uses_content(monkeypatch) -> None:
     monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()