Skip to content

Bulk asynchronous downloader for multiple file hosts

refactor: remove repr_fields

NTFSvolume6bcf2727f48e
diff --git a/cyberdrop_dl/scrape_mapper.py b/cyberdrop_dl/scrape_mapper.py
index e849ca0a6..d5c7c464b 100644
--- a/cyberdrop_dl/scrape_mapper.py
+++ b/cyberdrop_dl/scrape_mapper.py
@@ -22,7 +22,6 @@ from cyberdrop_dl.scrape_source import (
load_items_from_file,
load_items_from_iterable,
)
-from cyberdrop_dl.signature import repr_fields
from cyberdrop_dl.url_objects import AbsoluteHttpURL, ScrapeItem, ScrapeItemType
from cyberdrop_dl.utils import remove_trailing_slash
@@ -112,13 +111,13 @@ class ScrapeMapper:
_ready: bool = dataclasses.field(init=False, default=False)
def __repr__(self) -> str:
- fields = repr_fields(
- ("seen_url", len(self._seen_urls)),
- ("crawlers", len(self.crawlers)),
- ("tasks_mngr", self.task_mngr),
- ("factory", self._factory),
+ fields = (
+ f"seen_url={len(self._seen_urls):,}",
+ f"crawlers={len(self.crawlers):,}",
+ f"tasks_mngr={self.task_mngr!r}",
+ f"factory={self._factory!r}",
)
- return f"<{type(self).__name__}>{', '.join(fields)}"
+ return f"<{type(self).__name__}>({', '.join(fields)})"
def _scrape_queue(self) -> int:
return sum(crawler.waiting_items for crawler in self._factory)
diff --git a/cyberdrop_dl/signature.py b/cyberdrop_dl/signature.py
index 522ea91f9..1eaa1d183 100644
--- a/cyberdrop_dl/signature.py
+++ b/cyberdrop_dl/signature.py
@@ -1,12 +1,12 @@
from __future__ import annotations
import reprlib
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
if TYPE_CHECKING:
import functools
import inspect
- from collections.abc import Callable, Generator
+ from collections.abc import Callable
def copy[**P, T, R](target: Callable[P, R], /) -> Callable[[Callable[..., T]], Callable[P, T]]:
def decorator(func: Callable[..., T]) -> Callable[P, T]:
@@ -30,16 +30,11 @@ 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:
- fields = ((name, getattr(self, name)) for name in names)
- return f"<{type(self).__name__}({', '.join(repr_fields(*fields))}>"
+ fields = (f"{name}={getattr(self, name)!r}" for name in names)
+ return f"<{type(self).__name__}({', '.join(fields)}>"
return repr_