Simplified queue filtering by status & error

Author: ManiMatter

src/jobs/remove_failed_downloads.py

@@ -6,4 +6,4 @@ class RemoveFailedDownloads(RemovalJob):
     blocklist = False
 
     async def _find_affected_items(self):
-        return self.queue_manager.filter_queue_by_status(self.queue, ["failed"])
+        return self.queue_manager.filter_queue(self.queue, ["failed"])

src/jobs/remove_metadata_missing.py

@@ -7,4 +7,4 @@ class RemoveMetadataMissing(RemovalJob):
 
     async def _find_affected_items(self):
         conditions = [("queued", "qBittorrent is downloading metadata")]
-        return self.queue_manager.filter_queue_by_status_and_error_message(self.queue, conditions)
+        return self.queue_manager.filter_queue(self.queue, conditions)

src/jobs/remove_stalled.py

@@ -9,4 +9,4 @@ class RemoveStalled(RemovalJob):
 
     async def _find_affected_items(self):
         conditions = [("warning", "The download is stalled with no connections")]
-        return self.queue_manager.filter_queue_by_status_and_error_message(self.queue, conditions)
+        return self.queue_manager.filter_queue(self.queue, conditions)

src/utils/queue_manager.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Union
 from src.utils.common import make_request, extract_json_from_response
 from src.utils.log_setup import logger
 
@@ -199,21 +200,34 @@ def group_by_download_id(self, queue_items):
 
         return grouped_dict
 
-    @staticmethod
-    def filter_queue_by_status(queue, statuses: list[str]) -> list[dict]:
-        """Filter queue items that match any of the given statuses."""
-        return [item for item in queue if item.get("status") in statuses]
 
     @staticmethod
-    def filter_queue_by_status_and_error_message(
-        queue, conditions: list[tuple[str, str]]
+    def filter_queue(
+        queue: list[dict],
+        conditions: list[Union[str, tuple[str, str]]],
     ) -> list[dict]:
-        """Filter queue items that match any given (status, errorMessage) pair."""
-        queue_items = []
+        """
+        Filter queue items by status or (status, errorMessage) pairs.
+
+        - If an entry in `conditions` is a string, only status is checked.
+        - If it's a (status, errorMessage) tuple, both must match.
+        """
+        filtered_items = []
         for item in queue:
-            if "errorMessage" in item and "status" in item:
-                for status, message in conditions:
-                    if item["status"] == status and item["errorMessage"] == message:
-                        queue_items.append(item)
-                        break  # Stop checking other conditions once one matches
-        return queue_items
+            item_status = item.get("status")
+            item_error = item.get("errorMessage")
+
+            for condition in conditions:
+                if isinstance(condition, str):
+                    if item_status == condition:
+                        filtered_items.append(item)
+                        break
+                elif (
+                    isinstance(condition, tuple)
+                    and len(condition) == 2
+                    and item_status == condition[0]
+                    and item_error == condition[1]
+                ):
+                    filtered_items.append(item)
+                    break
+        return filtered_items