Simplification on connection test

Author: ManiMatter

src/job_manager.py

@@ -35,7 +35,7 @@ async def removal_jobs(self):
         if not await self._queue_has_items():
             return
 
-        if not await self._qbit_connected():
+        if not await self._download_clients_connected():
             return
 
         # Refresh trackers
@@ -57,11 +57,17 @@ async def search_jobs(self):
             return
         if self.settings.jobs.search_missing.enabled:
             await SearchHandler(
-                arr=self.arr, settings=self.settings, missing_or_cutoff="missing", job_name="search_missing"
+                arr=self.arr,
+                settings=self.settings,
+                missing_or_cutoff="missing",
+                job_name="search_missing",
             ).handle_search()
         if self.settings.jobs.search_unmet_cutoff.enabled:
             await SearchHandler(
-                arr=self.arr, settings=self.settings, missing_or_cutoff="cutoff", job_name="search_cutoff_unmet"
+                arr=self.arr,
+                settings=self.settings,
+                missing_or_cutoff="cutoff",
+                job_name="search_cutoff_unmet",
             ).handle_search()
 
     async def _queue_has_items(self):
@@ -81,27 +87,22 @@ async def _queue_has_items(self):
         logger.verbose("Removal Jobs: None triggered (Queue is empty)")
         return False
 
-    async def _qbit_connected(self):
-        for qbit in self.settings.download_clients.qbittorrent:
-            logger.debug(
-                f"job_manager.py/_queue_has_items (Before any removal jobs): Checking if qbit is connected to the internet"
-            )
-            # Check if any client is disconnected
-            if not await qbit.check_qbit_connected():
-                logger.warning(
-                    f">>> qBittorrent is disconnected. Skipping queue cleaning on {self.arr.name}.",
-                )
+    async def _download_clients_connected(self):
+        for clients in [
+            self.settings.download_clients.qbittorrent,
+            self.settings.download_clients.sabnzbd,
+        ]:
+            if not await self._check_client_connection_status(clients):
                 return False
+        return True
 
-        for sabnzbd in self.settings.download_clients.sabnzbd:
+    async def _check_client_connection_status(self, clients):
+        for client in clients:
             logger.debug(
-                f"job_manager.py/_queue_has_items (Before any removal jobs): Checking if SABnzbd is connected"
+                f"job_manager.py/_check_client_connection_status: Checking if {client.name} is connected"
             )
-            # Check if any client is disconnected
-            if not await sabnzbd.check_sabnzbd_connected():
-                logger.warning(
-                    f">>> SABnzbd is disconnected. Skipping queue cleaning on {self.arr.name}.",
-                )
+            if not await client.check_connected():
+                logger.warning(f">>> {client.name} is disconnected. Skipping queue cleaning on {self.arr.name}.")
                 return False
         return True
 

src/jobs/remove_bad_files.py

@@ -45,7 +45,6 @@ async def _find_affected_items(self):
             elif download_client_type == "sabnzbd":
                 # SABnzbd doesn't support bad file removal in the same way as BitTorrent
                 # Usenet doesn't have the concept of "availability" or individual file selection
-                logger.debug("remove_bad_files: Skipping SABnzbd downloads (not applicable for Usenet)")
                 continue
         return affected_items
 

src/settings/_download_clients_qbit.py

@@ -220,7 +220,7 @@ async def check_qbit_reachability(self):
             logger.error(f"-- | qBittorrent\n❗️ {e}\n{tip}\n")
             wait_and_exit()
 
-    async def check_qbit_connected(self):
+    async def check_connected(self):
         """Check if the qBittorrent is connected to internet."""
         logger.debug(
             "_download_clients_qBit.py/check_qbit_reachability: Checking if qbit is connected to the internet"

src/settings/_download_clients_sabnzbd.py

@@ -127,10 +127,10 @@ async def check_sabnzbd_reachability(self):
             logger.error(f"-- | SABnzbd\n❗️ {e}\n{tip}\n")
             wait_and_exit()
 
-    async def check_sabnzbd_connected(self):
+    async def check_connected(self):
         """Check if SABnzbd is connected and operational."""
         logger.debug(
-            "_download_clients_sabnzbd.py/check_sabnzbd_connected: Checking if SABnzbd is connected"
+            "_download_clients_sabnzbd.py/check_connected: Checking if SABnzbd is connected"
         )
         params = {
             "mode": "status",