From d69afa42dd3329dd61c5f20d7155db7b39517caa Mon Sep 17 00:00:00 2001
From: Feramance <techagius2093@gmail.com>
Date: Fri, 6 Dec 2024 11:12:35 +0100
Subject: [PATCH] Adjusted request conditions further

---
 qBitrr/arss.py | 58 ++++++--------------------------------------------
 1 file changed, 7 insertions(+), 51 deletions(-)

diff --git a/qBitrr/arss.py b/qBitrr/arss.py
index 0abcd9c2..64aec45d 100755
--- a/qBitrr/arss.py
+++ b/qBitrr/arss.py
@@ -1623,32 +1623,9 @@ def db_get_request_files(self) -> Iterable[tuple[MoviesFilesModel | EpisodeFiles
         self.logger.trace("Getting request files")
         if self.type == "sonarr":
             condition = self.model_file.IsRequest == True
-            condition = self.model_file.AirDateUtc.is_null(False)
-            if not self.search_specials:
-                condition &= self.model_file.SeasonNumber != 0
-            if self.do_upgrade_search:
-                condition &= self.model_file.Upgrade == False
-            else:
-                if self.quality_unmet_search and not self.custom_format_unmet_search:
-                    condition &= (
-                        self.model_file.Searched == False | self.model_file.QualityMet == False
-                    )
-                elif not self.quality_unmet_search and self.custom_format_unmet_search:
-                    condition &= (
-                        self.model_file.Searched
-                        == False | self.model_file.CustomFormatMet
-                        == False
-                    )
-                elif self.quality_unmet_search and self.custom_format_unmet_search:
-                    condition &= (
-                        self.model_file.Searched
-                        == False | self.model_file.QualityMet
-                        == False | self.model_file.CustomFormatMet
-                        == False
-                    )
-                else:
-                    condition &= self.model_file.EpisodeFileId == 0
-                    condition &= self.model_file.Searched == False
+            condition &= self.model_file.AirDateUtc.is_null(False)
+            condition &= self.model_file.EpisodeFileId == 0
+            condition &= self.model_file.Searched == False
             condition &= self.model_file.AirDateUtc < (
                 datetime.now(timezone.utc) - timedelta(days=1)
             )
@@ -1664,30 +1641,9 @@ def db_get_request_files(self) -> Iterable[tuple[MoviesFilesModel | EpisodeFiles
             )
         elif self.type == "radarr":
             condition = self.model_file.IsRequest == True
-            condition = self.model_file.Year.is_null(False)
-            if self.do_upgrade_search:
-                condition &= self.model_file.Upgrade == False
-            else:
-                if self.quality_unmet_search and not self.custom_format_unmet_search:
-                    condition &= (
-                        self.model_file.Searched == False | self.model_file.QualityMet == False
-                    )
-                elif not self.quality_unmet_search and self.custom_format_unmet_search:
-                    condition &= (
-                        self.model_file.Searched
-                        == False | self.model_file.CustomFormatMet
-                        == False
-                    )
-                elif self.quality_unmet_search and self.custom_format_unmet_search:
-                    condition &= (
-                        self.model_file.Searched
-                        == False | self.model_file.QualityMet
-                        == False | self.model_file.CustomFormatMet
-                        == False
-                    )
-                else:
-                    condition &= self.model_file.MovieFileId == 0
-                    condition &= self.model_file.Searched == False
+            condition &= self.model_file.Year.is_null(False)
+            condition &= self.model_file.MovieFileId == 0
+            condition &= self.model_file.Searched == False
             entries = list(
                 self.model_file.select()
                 .where(condition)
@@ -4731,7 +4687,7 @@ def run_request_search(self):
                         self.logger.debug("Waiting for active request search commands")
                         time.sleep(loop_delay)
                 self.request_search_timer = time.time()
-                return
+                return None
             except NoConnectionrException as e:
                 self.logger.error(e.message)
                 raise DelayLoopException(length=300, type=e.type)