Skip to content

Bulk asynchronous downloader for multiple file hosts

refactor: update UI if we are cancelled

NTFSvolume505a8b474dae
diff --git a/cyberdrop_dl/progress/scraping/panel.py b/cyberdrop_dl/progress/scraping/panel.py
index e21ffc128..257622caa 100644
--- a/cyberdrop_dl/progress/scraping/panel.py
+++ b/cyberdrop_dl/progress/scraping/panel.py
@@ -31,6 +31,9 @@ class StatusMessage:
_messages: dict[int, tuple[Spinner, Text]] = dataclasses.field(init=False, default_factory=dict)
_cols: Columns = dataclasses.field(init=False, default_factory=Columns)
+ def shutdown(self) -> None:
+ self._cols.renderables[0] = self.description + " [yellow](shutting down...)[/yellow]"
+
def __post_init__(self) -> None:
self._cols.renderables.extend([self.description, Spinner("point", style="green"), "|"])
diff --git a/cyberdrop_dl/scrape_mapper.py b/cyberdrop_dl/scrape_mapper.py
index 5200be938..4819976e1 100644
--- a/cyberdrop_dl/scrape_mapper.py
+++ b/cyberdrop_dl/scrape_mapper.py
@@ -234,14 +234,19 @@ class ScrapeMapper:
@contextlib.contextmanager
def __cancel_context(self) -> Generator[None]:
- try:
- with self.tui():
+ cancelled: bool = False
+ with self.tui():
+ try:
yield
- except asyncio.CancelledError:
- # This is a KeyboardInterrupt cause we never cancel tasks
- if not self._shutting_down:
- raise
+ except asyncio.CancelledError:
+ # This is a KeyboardInterrupt cause we never cancel tasks
+ if not self._shutting_down:
+ raise
+
+ cancelled = True
+ self.tui.status.shutdown()
+ if cancelled:
logger.warning("Scraping aborted ('Ctrl + C' pressed)")
async def __async_init__(self) -> None: