Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: add some repr and name utils
NTFSvolumeea8f68ed6420
diff --git a/cyberdrop_dl/crawlers/crawler.py b/cyberdrop_dl/crawlers/crawler.pyindex e973a3f8b..480a51f06 100644--- a/cyberdrop_dl/crawlers/crawler.py+++ b/cyberdrop_dl/crawlers/crawler.py@@ -663,7 +663,7 @@ class Crawler(HTTPMixin, HLSMixin, ABC):@finaldef create_title(self, title: str, album_id: str | None = None, thread_id: int | None = None) -> str:"""Creates the title for the scrape item."""- return create_title(self.config, self.FOLDER_DOMAIN, title, album_id, thread_id)+ return compose_title(self.config, self.FOLDER_DOMAIN, title, album_id, thread_id)@finaldef create_separate_post_title(@@ -873,7 +873,7 @@ class Crawler(HTTPMixin, HLSMixin, ABC):@finaldef handle_subs(self, scrape_item: ScrapeItem, video_filename: str, subtitles: Iterable[ISO639Subtitle]) -> None:- counter = Counter()+ counter: Counter[str] = Counter()video_stem = Path(video_filename).stemfor sub in subtitles:link = self.parse_url(sub.url)@@ -1042,7 +1042,7 @@ def _prepare_download_path(item: ScrapeItem, domain: str) -> Path:return path-def create_title(+def compose_title(config: Config,domain: str,title: str,@@ -1062,3 +1062,16 @@ def create_title(# Remove double spacesreturn " ".join(title.split(" "))+++def compose_ep_name(season: int | None, ep: int | None, name: str | None) -> str:+ prefix = ""+ if season is not None:+ prefix += f"S{season:02}"+ if ep is not None:+ prefix += f"E{ep:03}"++ name = " - ".join(filter(None, (prefix, name)))+ if not name:+ raise ValueError("Empty episode title")+ return namediff --git a/cyberdrop_dl/signature.py b/cyberdrop_dl/signature.pyindex 3a3e9d1ed..522ea91f9 100644--- a/cyberdrop_dl/signature.py+++ b/cyberdrop_dl/signature.py@@ -1,7 +1,7 @@from __future__ import annotationsimport reprlib-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Anyif TYPE_CHECKING:import functools@@ -30,14 +30,16 @@ else:return decorator+def repr_fields(*fields: tuple[str, Any]) -> Generator[str]:+ for name, value in fields:+ yield f"{name}={value!r}"++def simple_repr(*names: str) -> Callable[..., str]:@reprlib.recursive_repr()def repr_(self: object) -> str:- def fields() -> Generator[str]:- for name in names:- yield f"{name}={getattr(self, name)!r}"-- return f"<{type(self).__name__}({', '.join(fields())}>"+ fields = ((name, getattr(self, name)) for name in names)+ return f"<{type(self).__name__}({', '.join(repr_fields(*fields))}>"return repr_diff --git a/tests/crawlers/test_crawlers.py b/tests/crawlers/test_crawlers.pyindex be8063136..bc311a0db 100644--- a/tests/crawlers/test_crawlers.py+++ b/tests/crawlers/test_crawlers.py@@ -11,6 +11,7 @@ from unittest import mockimport pytestfrom pydantic import TypeAdapter+from cyberdrop_dl.crawlers.crawler import compose_ep_namefrom cyberdrop_dl.scrape_mapper import ScrapeMapperfrom cyberdrop_dl.url_objects import AbsoluteHttpURL, MediaItem, ScrapeItemfrom cyberdrop_dl.utils import parse_url@@ -276,3 +277,24 @@ def test_load_test_data() -> None:for case in test_data["dropbox"]:assert type(case) is dictassert "url" in case+++ ("season", "ep", "name", "expected"),+ [+ (20, 34, "episode a", "S20E034 - episode a"),+ (9, 2, "episode b", "S09E002 - episode b"),+ (2, 4, None, "S02E004"),+ (None, 2, None, "E002"),+ (None, None, "episode d", "episode d"),+ (120, 0, "episode e", "S120E000 - episode e"),+ ],+)+def test_compose_ep_name(season: int | None, ep: int | None, name: str | None, expected: str) -> None:+ name = compose_ep_name(season, ep, name)+ assert name == expected+++def test_compose_ep_name_raise_value_error_if_empty() -> None:+ with pytest.raises(ValueError):+ compose_ep_name(None, None, "")