Nightly branch test

Feramance · Nov 15, 2023 · 8fe20da · 8fe20da
1 parent 25e636b
commit 8fe20da
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/qBitrr/arss.py b/qBitrr/arss.py
@@ -1203,10 +1203,10 @@ def db_get_files_series(
             yield None, False, False
         elif self.type == "sonarr":
             condition = self.model_file.AirDateUtc.is_null(False)
+            condition &= self.model_file.Searched == False
             if not self.search_specials:
                 condition &= self.model_file.SeasonNumber != 0
             if not self.do_upgrade_search:
-                condition &= self.model_file.Searched == False
                 condition &= self.model_file.EpisodeFileId == 0
             condition &= self.model_file.AirDateUtc < (
                 datetime.now(timezone.utc) - timedelta(hours=2)
@@ -1217,10 +1217,6 @@ def db_get_files_series(
             for i1, i2, i3 in self._search_todays(condition):
                 if i1 is not None:
                     yield i1, i2, i3
-            if not self.do_upgrade_search:
-                condition = self.series_file_model.Searched == False
-            else:
-                condition = self.series_file_model.Searched.is_null(False)
             for entry_ in (
                 self.series_file_model.select()
                 .where(condition)
@@ -1236,15 +1232,14 @@ def db_get_files_episodes(
             yield None, False, False
         elif self.type == "sonarr":
             condition = self.model_file.AirDateUtc.is_null(False)
-
+            condition &= self.model_file.Searched == False
             if not self.search_specials:
                 condition &= self.model_file.SeasonNumber != 0
             condition &= self.model_file.AirDateUtc.is_null(False)
             if not self.do_upgrade_search:
                 if self.quality_unmet_search:
                     condition &= self.model_file.QualityMet == False
                 else:
-                    condition &= self.model_file.Searched == False
                     condition &= self.model_file.EpisodeFileId == 0
             condition &= self.model_file.AirDateUtc < (
                 datetime.now(timezone.utc) - timedelta(hours=2)