Better feedback performance

- by skippping qbt types in additional calls
- fixed date removal (was not respecting --keep)
- clarified some feedback text

Author: rgaudin

src/kiwixseeder/qbittorrent.py

@@ -1,5 +1,8 @@
+# pyright: reportUnknownMemberType=false, reportArgumentType=false, reportUnknownArgumentType=false, reportUnknownParameterType=false, reportUnknownVariableType=false, reportMissingImports=false
+
 import datetime
 import time
+from collections.abc import Generator
 from dataclasses import dataclass
 from typing import Self
 
@@ -109,10 +112,26 @@ def add_url(self, url: str, btih: str | None) -> str:
         finally:
             self.reload()
 
+    def get_all_added_ts(self, btihs: list[str]) -> list[int]:
+        """added-on timestamps for a list of btihs"""
+        return [
+            int(tdict["added_on"])
+            for tdict in client.torrents.info(
+                torrent_hashes=btihs, SIMPLE_RESPONSES=True
+            )
+        ]
+
+    def get_all(self, btihs: list[str] | None = None) -> Generator[TorrentInfo]:
+        """TorrentInfo for all btihs or a supplied list of them"""
+        if not btihs:
+            btihs = list(self.btihs.keys())
+        for tdict in client.torrents.info(torrent_hashes=btihs, SIMPLE_RESPONSES=True):
+            yield TorrentInfo.from_torrentdict(tdict)
+
     def get(self, ident: str) -> TorrentInfo:
         """Torrent dict from its hash"""
         return TorrentInfo.from_torrentdict(
-            client.torrents.info(torrent_hashes=ident, SIMPLE_RESPONSES=True)[0]  # pyright: ignore[reportUnknownArgumentType, reportArgumentType]
+            client.torrents.info(torrent_hashes=ident, SIMPLE_RESPONSES=True)[0]
         )
 
     def get_or_none(
@@ -146,4 +165,11 @@ def remove(self, ident: str) -> bool:
     def total_size(self) -> int:
         """total size of our torrents"""
         self.reload()
-        return sum(self.get(btih).size for btih in self.btihs)
+        return sum(
+            [
+                int(tdict["size"])
+                for tdict in client.torrents.info(
+                    torrent_hashes=self.btihs, SIMPLE_RESPONSES=True
+                )
+            ]
+        )

src/kiwixseeder/runner.py

@@ -92,8 +92,8 @@ def run(self) -> int:
             f"in {QBT_CAT_NAME}"
         )
         if context.debug:
-            for btih in self.manager.btihs:
-                logger.debug(f"* {self.manager.get(btih)!s}")
+            for torrent in self.manager.get_all():
+                logger.debug(f"* {torrent!s}")
 
         self.remove_outdated_torrents()
         self.reconcile_books_and_torrents()
@@ -162,10 +162,11 @@ def remove_outdated_torrents(self):
 
         # reconciling existing torrents and books
         unselected_books = list(self.manager.btihs.keys())
+        all_btihs = self.manager.btihs.items()
         for book in self.books:
             btihs = [
                 btih
-                for btih, fname in self.manager.btihs.items()
+                for btih, fname in all_btihs
                 # having condition on name first is important and it allows
                 # us to only compare on btih if name matches.
                 # we cant direclty compare on btih as it would require getting the
@@ -177,26 +178,41 @@ def remove_outdated_torrents(self):
                 book.btih = btihs[0]
                 unselected_books.remove(book.btih)
 
+        # get added_on for all btih
+        all_added_ts: dict[str, int] = dict(
+            zip(
+                unselected_books,
+                self.manager.get_all_added_ts(unselected_books),
+                strict=False,
+            )
+        )
         # keep those that are within --keep duration
-        keep_until = self.now - datetime.timedelta(seconds=context.keep_for)
+        keep_until = (
+            self.now - datetime.timedelta(seconds=context.keep_for)
+        ).timestamp()
         for btih in unselected_books:
-            if self.manager.get(btih).added_on <= keep_until:
+            # keep (remove from unselected) is added to BT after that date in the past
+            if all_added_ts[btih] > keep_until:
                 unselected_books.remove(btih)
+            else:
+                logger.error(
+                    f"{self.manager.get(btih).added_on} is before {keep_until}"
+                )
 
         if not unselected_books:
             logger.info("> None")
             return
 
         logger.info(
-            f"{self.banner}Removing {len(unselected_books)} outdated torrents "
-            "(not in catalog, over --keep)…"
+            f"{self.banner}Removing {len(unselected_books)} torrents: "
+            "outside filters or not in catalog and anterior to --keep"
         )
-        for btih in unselected_books:
-            logger.info(f"- {self.manager.get(btih)!s}")
+        for torrent in self.manager.get_all(btihs=unselected_books):
+            logger.info(f"- {torrent!s}")
             if context.dry_run:
                 continue
-            if not self.manager.remove(btih):
-                logger.error(f"Failed to remove {btih}")
+            if not self.manager.remove(torrent.btih):
+                logger.error(f"Failed to remove {torrent.btih}")
 
     def ensure_storage(self):
         torrents_size = self.manager.total_size
@@ -213,6 +229,8 @@ def ensure_storage(self):
 
         if total_size > context.max_storage:
             logger.error("Total size exceeds max-storage")
+            if context.dry_run:
+                logger.error(">> does not account removal in dry-mode")
             return True
 
     def reconcile_books_and_torrents(self):