qBitrr2 5.8.4__tar.gz → 5.8.6__tar.gz

{qbitrr2-5.8.4/qBitrr2.egg-info → qbitrr2-5.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qBitrr2
-Version: 5.8.4
+Version: 5.8.6
 Summary: Intelligent automation for qBittorrent and *Arr apps (Radarr/Sonarr/Lidarr) - health monitoring, instant imports, quality upgrades, request integration
 Home-page: https://github.com/Feramance/qBitrr
 Author: Feramance

{qbitrr2-5.8.4 → qbitrr2-5.8.6}/pyproject.toml

@@ -28,7 +28,7 @@ target-version = ['py311']
 
 [tool.poetry]
 name = "pypi-public"
-version = "5.8.4"
+version = "5.8.6"
 description = "Intelligent automation for qBittorrent and *Arr apps (Radarr/Sonarr/Lidarr) - health monitoring, instant imports, quality upgrades, request integration"
 authors = ["Drapersniper", "Feramance"]
 readme = "README.md"

{qbitrr2-5.8.4 → qbitrr2-5.8.6}/qBitrr/arss.py

@@ -1835,7 +1835,10 @@ class Arr:
                         # Create a series entry for searching
                         series_model = (
                             self.series_file_model.select()
-                            .where(self.series_file_model.EntryId == series_id)
+                            .where(
+                                (self.series_file_model.EntryId == series_id)
+                                & (self.series_file_model.ArrInstance == self._name)
+                            )
                             .first()
                         )
                         if series_model:
@@ -1885,7 +1888,8 @@ class Arr:
             self.loop_completed and self.reset_on_completion and self.series_search
         ):  # Only wipe if a loop completed was tagged
             self.series_file_model.update(Searched=False, Upgrade=False).where(
-                self.series_file_model.Searched == True
+                (self.series_file_model.Searched == True)
+                & (self.series_file_model.ArrInstance == self._name)
             ).execute()
             while True:
                 try:
@@ -1901,7 +1905,8 @@ class Arr:
                 ):
                     continue
             self.series_file_model.delete().where(
-                self.series_file_model.EntryId.not_in(ids)
+                (self.series_file_model.EntryId.not_in(ids))
+                & (self.series_file_model.ArrInstance == self._name)
             ).execute()
             self.loop_completed = False
 
@@ -1929,7 +1934,9 @@ class Arr:
                     JSONDecodeError,
                 ) as e:
                     continue
-            self.model_file.delete().where(self.model_file.EntryId.not_in(ids)).execute()
+            self.model_file.delete().where(
+                (self.model_file.EntryId.not_in(ids)) & (self.model_file.ArrInstance == self._name)
+            ).execute()
             self.loop_completed = False
 
     def db_reset__movie_searched_state(self):
@@ -1939,7 +1946,7 @@ class Arr:
             self.loop_completed is True and self.reset_on_completion
         ):  # Only wipe if a loop completed was tagged
             self.model_file.update(Searched=False, Upgrade=False).where(
-                self.model_file.Searched == True
+                (self.model_file.Searched == True) & (self.model_file.ArrInstance == self._name)
             ).execute()
             while True:
                 try:
@@ -1954,7 +1961,9 @@ class Arr:
                     JSONDecodeError,
                 ):
                     continue
-            self.model_file.delete().where(self.model_file.EntryId.not_in(ids)).execute()
+            self.model_file.delete().where(
+                (self.model_file.EntryId.not_in(ids)) & (self.model_file.ArrInstance == self._name)
+            ).execute()
             self.loop_completed = False
 
     def db_reset__album_searched_state(self):
@@ -1964,7 +1973,7 @@ class Arr:
             self.loop_completed is True and self.reset_on_completion
         ):  # Only wipe if a loop completed was tagged
             self.model_file.update(Searched=False, Upgrade=False).where(
-                self.model_file.Searched == True
+                (self.model_file.Searched == True) & (self.model_file.ArrInstance == self._name)
             ).execute()
             while True:
                 try:
@@ -1981,7 +1990,9 @@ class Arr:
                     JSONDecodeError,
                 ):
                     continue
-            self.model_file.delete().where(self.model_file.EntryId.not_in(ids)).execute()
+            self.model_file.delete().where(
+                (self.model_file.EntryId.not_in(ids)) & (self.model_file.ArrInstance == self._name)
+            ).execute()
             self.loop_completed = False
 
     def db_get_files_series(self) -> list[list[SeriesFilesModel, bool, bool]] | None:
@@ -2037,9 +2048,13 @@ class Arr:
                 if i1 is not None:
                     entries.append([i1, i2, i3])
             if not self.do_upgrade_search:
-                condition = self.series_file_model.Searched == False
+                condition = (self.series_file_model.Searched == False) & (
+                    self.series_file_model.ArrInstance == self._name
+                )
             else:
-                condition = self.series_file_model.Upgrade == False
+                condition = (self.series_file_model.Upgrade == False) & (
+                    self.series_file_model.ArrInstance == self._name
+                )
 
             # Collect series entries with their priority based on episode reasons
             # Missing > CustomFormat > Quality > Upgrade
@@ -2079,7 +2094,9 @@ class Arr:
         if not (self.search_missing or self.do_upgrade_search):
             return None
         elif self.type == "sonarr":
-            condition = self.model_file.AirDateUtc.is_null(False)
+            condition = (self.model_file.AirDateUtc.is_null(False)) & (
+                self.model_file.ArrInstance == self._name
+            )
             if not self.search_specials:
                 condition &= self.model_file.SeasonNumber != 0
             if self.do_upgrade_search:
@@ -2160,7 +2177,9 @@ class Arr:
         if not (self.search_missing or self.do_upgrade_search):
             return None
         if self.type == "radarr":
-            condition = self.model_file.Year.is_null(False)
+            condition = (self.model_file.Year.is_null(False)) & (
+                self.model_file.ArrInstance == self._name
+            )
             if self.do_upgrade_search:
                 condition &= self.model_file.Upgrade == False
             else:
@@ -2211,7 +2230,7 @@ class Arr:
                 entries.append([entry, False, False])
             return entries
         elif self.type == "lidarr":
-            condition = True  # Placeholder, will be refined
+            condition = self.model_file.ArrInstance == self._name
             if self.do_upgrade_search:
                 condition &= self.model_file.Upgrade == False
             else:
@@ -2264,7 +2283,9 @@ class Arr:
         entries = []
         self.logger.trace("Getting request files")
         if self.type == "sonarr":
-            condition = self.model_file.IsRequest == True
+            condition = (self.model_file.IsRequest == True) & (
+                self.model_file.ArrInstance == self._name
+            )
             condition &= self.model_file.AirDateUtc.is_null(False)
             condition &= self.model_file.EpisodeFileId == 0
             condition &= self.model_file.Searched == False
@@ -2282,7 +2303,9 @@ class Arr:
                 .execute()
             )
         elif self.type == "radarr":
-            condition = self.model_file.IsRequest == True
+            condition = (self.model_file.IsRequest == True) & (
+                self.model_file.ArrInstance == self._name
+            )
             condition &= self.model_file.Year.is_null(False)
             condition &= self.model_file.MovieFileId == 0
             condition &= self.model_file.Searched == False
@@ -2826,7 +2849,8 @@ class Arr:
                 if not series:
                     self.model_file: EpisodeFilesModel
                     episodeData = self.model_file.get_or_none(
-                        self.model_file.EntryId == db_entry["id"]
+                        (self.model_file.EntryId == db_entry["id"])
+                        & (self.model_file.ArrInstance == self._name)
                     )
                     while True:
                         try:
@@ -2945,7 +2969,8 @@ class Arr:
                         ):
                             searched = True
                             self.model_queue.update(Completed=True).where(
-                                self.model_queue.EntryId == episode["id"]
+                                (self.model_queue.EntryId == episode["id"])
+                                & (self.model_queue.ArrInstance == self._name)
                             ).execute()
 
                         if self.use_temp_for_missing:
@@ -3154,14 +3179,16 @@ class Arr:
                         db_commands.execute()
                     else:
                         db_commands = self.model_file.delete().where(
-                            self.model_file.EntryId == episode["id"]
+                            (self.model_file.EntryId == episode["id"])
+                            & (self.model_file.ArrInstance == self._name)
                         )
                         db_commands.execute()
                 else:
                     self.series_file_model: SeriesFilesModel
                     EntryId = db_entry["id"]
                     seriesData = self.series_file_model.get_or_none(
-                        self.series_file_model.EntryId == EntryId
+                        (self.series_file_model.EntryId == EntryId)
+                        & (self.series_file_model.ArrInstance == self._name)
                     )
                     if db_entry["monitored"] or self.search_unmonitored:
                         while True:
@@ -3339,14 +3366,18 @@ class Arr:
                         # No need to recursively process episodes here to avoid duplication
                     else:
                         db_commands = self.series_file_model.delete().where(
-                            self.series_file_model.EntryId == EntryId
+                            (self.series_file_model.EntryId == EntryId)
+                            & (self.series_file_model.ArrInstance == self._name)
                         )
                         db_commands.execute()
 
             elif self.type == "radarr":
                 self.model_file: MoviesFilesModel
                 searched = False
-                movieData = self.model_file.get_or_none(self.model_file.EntryId == db_entry["id"])
+                movieData = self.model_file.get_or_none(
+                    (self.model_file.EntryId == db_entry["id"])
+                    & (self.model_file.ArrInstance == self._name)
+                )
                 if self.minimum_availability_check(db_entry) and (
                     db_entry["monitored"] or self.search_unmonitored
                 ):
@@ -3406,7 +3437,8 @@ class Arr:
                     ):
                         searched = True
                         self.model_queue.update(Completed=True).where(
-                            self.model_queue.EntryId == db_entry["id"]
+                            (self.model_queue.EntryId == db_entry["id"])
+                            & (self.model_queue.ArrInstance == self._name)
                         ).execute()
 
                     profile_switch_timestamp = None
@@ -3575,7 +3607,8 @@ class Arr:
                     db_commands.execute()
                 else:
                     db_commands = self.model_file.delete().where(
-                        self.model_file.EntryId == db_entry["id"]
+                        (self.model_file.EntryId == db_entry["id"])
+                        & (self.model_file.ArrInstance == self._name)
                     )
                     db_commands.execute()
             elif self.type == "lidarr":
@@ -3584,7 +3617,8 @@ class Arr:
                     self.model_file: AlbumFilesModel
                     searched = False
                     albumData = self.model_file.get_or_none(
-                        self.model_file.EntryId == db_entry["id"]
+                        (self.model_file.EntryId == db_entry["id"])
+                        & (self.model_file.ArrInstance == self._name)
                     )
                     if db_entry["monitored"] or self.search_unmonitored:
                         while True:
@@ -3927,20 +3961,23 @@ class Arr:
                                 )
                     else:
                         db_commands = self.model_file.delete().where(
-                            self.model_file.EntryId == db_entry["id"]
+                            (self.model_file.EntryId == db_entry["id"])
+                            & (self.model_file.ArrInstance == self._name)
                         )
                         db_commands.execute()
                         # Also delete tracks for this album (Lidarr only)
                         if self.track_file_model:
                             self.track_file_model.delete().where(
-                                self.track_file_model.AlbumId == db_entry["id"]
+                                (self.track_file_model.AlbumId == db_entry["id"])
+                                & (self.track_file_model.ArrInstance == self._name)
                             ).execute()
                 else:
                     # Artist handling
                     self.artists_file_model: ArtistFilesModel
                     EntryId = db_entry["id"]
                     artistData = self.artists_file_model.get_or_none(
-                        self.artists_file_model.EntryId == EntryId
+                        (self.artists_file_model.EntryId == EntryId)
+                        & (self.artists_file_model.ArrInstance == self._name)
                     )
                     if db_entry["monitored"] or self.search_unmonitored:
                         while True:
@@ -4328,7 +4365,8 @@ class Arr:
                         file_model.AirDateUtc,
                     )
                     self.model_file.update(Searched=True, Upgrade=True).where(
-                        file_model.EntryId == file_model.EntryId
+                        (self.model_file.EntryId == file_model.EntryId)
+                        & (self.model_file.ArrInstance == self._name)
                     ).execute()
                     return True
                 active_commands = self.arr_db_query_commands_count()
@@ -4371,7 +4409,8 @@ class Arr:
                         ):
                             continue
                 self.model_file.update(Searched=True, Upgrade=True).where(
-                    file_model.EntryId == file_model.EntryId
+                    (self.model_file.EntryId == file_model.EntryId)
+                    & (self.model_file.ArrInstance == self._name)
                 ).execute()
                 reason_text = getattr(file_model, "Reason", None) or None
                 if reason_text:
@@ -4442,7 +4481,8 @@ class Arr:
                     ):
                         continue
                 self.model_file.update(Searched=True, Upgrade=True).where(
-                    file_model.EntryId == file_model.EntryId
+                    (self.model_file.EntryId == file_model.EntryId)
+                    & (self.model_file.ArrInstance == self._name)
                 ).execute()
                 self.logger.hnotice(
                     "%sSearching for: %s | %s | [id=%s]",
@@ -4482,7 +4522,8 @@ class Arr:
                     file_model.EntryId,
                 )
                 self.model_file.update(Searched=True, Upgrade=True).where(
-                    file_model.EntryId == file_model.EntryId
+                    (self.model_file.EntryId == file_model.EntryId)
+                    & (self.model_file.ArrInstance == self._name)
                 ).execute()
                 return True
             active_commands = self.arr_db_query_commands_count()
@@ -4514,7 +4555,8 @@ class Arr:
                     ):
                         continue
             self.model_file.update(Searched=True, Upgrade=True).where(
-                file_model.EntryId == file_model.EntryId
+                (self.model_file.EntryId == file_model.EntryId)
+                & (self.model_file.ArrInstance == self._name)
             ).execute()
             reason_text = getattr(file_model, "Reason", None)
             if reason_text:
@@ -4567,7 +4609,8 @@ class Arr:
                     file_model.EntryId,
                 )
                 self.model_file.update(Searched=True, Upgrade=True).where(
-                    file_model.EntryId == file_model.EntryId
+                    (self.model_file.EntryId == file_model.EntryId)
+                    & (self.model_file.ArrInstance == self._name)
                 ).execute()
                 return True
             active_commands = self.arr_db_query_commands_count()
@@ -4600,7 +4643,8 @@ class Arr:
                     ):
                         continue
             self.model_file.update(Searched=True, Upgrade=True).where(
-                file_model.EntryId == file_model.EntryId
+                (self.model_file.EntryId == file_model.EntryId)
+                & (self.model_file.ArrInstance == self._name)
             ).execute()
             reason_text = getattr(file_model, "Reason", None)
             if reason_text:
@@ -6195,7 +6239,12 @@ class Arr:
 
             # Retrieve the model entry from the database
             model_entry = (
-                self.model_file.select().where(self.model_file.EntryId == entry_id).first()
+                self.model_file.select()
+                .where(
+                    (self.model_file.EntryId == entry_id)
+                    & (self.model_file.ArrInstance == self._name)
+                )
+                .first()
             )
             if not model_entry:
                 return False
@@ -6268,7 +6317,10 @@ class Arr:
                     if self.model_queue:
                         with_database_retry(
                             lambda: self.model_queue.delete()
-                            .where(self.model_queue.EntryId.not_in(list(self.queue_file_ids)))
+                            .where(
+                                (self.model_queue.EntryId.not_in(list(self.queue_file_ids)))
+                                & (self.model_queue.ArrInstance == self._name)
+                            )
                             .execute(),
                             logger=self.logger,
                         )
@@ -6282,7 +6334,10 @@ class Arr:
                     if self.model_queue:
                         with_database_retry(
                             lambda: self.model_queue.delete()
-                            .where(self.model_queue.EntryId.not_in(list(self.queue_file_ids)))
+                            .where(
+                                (self.model_queue.EntryId.not_in(list(self.queue_file_ids)))
+                                & (self.model_queue.ArrInstance == self._name)
+                            )
                             .execute(),
                             logger=self.logger,
                         )
@@ -6567,7 +6622,8 @@ class Arr:
 
             # Find items with temp profiles that have exceeded timeout
             expired_items = model.select().where(
-                (model.LastProfileSwitchTime.is_null(False))
+                (model.ArrInstance == self._name)
+                & (model.LastProfileSwitchTime.is_null(False))
                 & (model.LastProfileSwitchTime < timeout_threshold)
                 & (model.CurrentProfileId.is_null(False))
                 & (model.OriginalProfileId.is_null(False))
@@ -6583,7 +6639,9 @@ class Arr:
                     # Not a temp profile anymore, clear tracking
                     model.update(
                         LastProfileSwitchTime=None, CurrentProfileId=None, OriginalProfileId=None
-                    ).where(model.EntryId == entry_id).execute()
+                    ).where(
+                        (model.EntryId == entry_id) & (model.ArrInstance == self._name)
+                    ).execute()
                     continue
 
                 # Reset to original profile via Arr API
@@ -6606,7 +6664,9 @@ class Arr:
                     # Clear tracking fields in database
                     model.update(
                         LastProfileSwitchTime=None, CurrentProfileId=None, OriginalProfileId=None
-                    ).where(model.EntryId == entry_id).execute()
+                    ).where(
+                        (model.EntryId == entry_id) & (model.ArrInstance == self._name)
+                    ).execute()
 
                     reset_count += 1
                     self.logger.info(

{qbitrr2-5.8.4 → qbitrr2-5.8.6}/qBitrr/bundled_data.py

@@ -1,5 +1,5 @@
-version = "5.8.4"
-git_hash = "5d3a2580"
+version = "5.8.6"
+git_hash = "236b1bf2"
 license_text = (
     "Licence can be found on:\n\nhttps://github.com/Feramance/qBitrr/blob/master/LICENSE"
 )

{qbitrr2-5.8.4 → qbitrr2-5.8.6}/qBitrr/webui.py

@@ -461,7 +461,8 @@ class WebUI:
             if is_request is not None:
                 query = query.where(model.IsRequest == is_request)
 
-            total = query.count()
+            # Total should be ALL items for this instance, not filtered results
+            total = base_query.count()
             page_items = query.order_by(model.Title.asc()).paginate(page + 1, page_size).iterator()
             movies = []
             for movie in page_items:
@@ -622,6 +623,9 @@ class WebUI:
 
             albums = []
 
+            # Total should be ALL albums for this instance, not filtered results
+            total = base_query.count()
+
             if group_by_artist:
                 # Paginate by artists: Two-pass approach with Peewee
                 # First, get all distinct artist names from the filtered query
@@ -632,7 +636,7 @@ class WebUI:
 
                 # Convert to list to avoid multiple iterations
                 all_artists = [row.ArtistTitle for row in artists_subquery]
-                total = len(all_artists)
+                len(all_artists)
 
                 # Paginate the artist list in Python
                 start_idx = page * page_size
@@ -650,7 +654,7 @@ class WebUI:
                     album_results = []
             else:
                 # Flat mode: paginate by albums as before
-                total = query.count()
+                # Note: total is already set to base_query.count() above
                 album_results = list(query.order_by(model.Title).paginate(page + 1, page_size))
 
             for album in album_results:
@@ -982,16 +986,22 @@ class WebUI:
             total_series = 0
 
             if series_model is not None:
-                series_query = series_model.select().where(
+                # Base query for ALL series in this instance (unfiltered)
+                base_series_query = series_model.select().where(
                     series_model.ArrInstance == arr_instance
                 )
+                # Total should be ALL series for this instance, not filtered results
+                total_series = base_series_query.count()
+
+                # Now build the filtered query for pagination
+                series_query = base_series_query
                 if search:
                     series_query = series_query.where(series_model.Title.contains(search))
                 if missing_only and missing_series_ids:
                     series_query = series_query.where(series_model.EntryId.in_(missing_series_ids))
-                total_series = series_query.count()
-                if total_series:
-                    max_pages = (total_series + page_size - 1) // page_size
+                filtered_series_count = series_query.count()
+                if filtered_series_count:
+                    max_pages = (filtered_series_count + page_size - 1) // page_size
                     if max_pages:
                         resolved_page = min(resolved_page, max_pages - 1)
                     resolved_page = max(resolved_page, 0)

{qbitrr2-5.8.4 → qbitrr2-5.8.6/qBitrr2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qBitrr2
-Version: 5.8.4
+Version: 5.8.6
 Summary: Intelligent automation for qBittorrent and *Arr apps (Radarr/Sonarr/Lidarr) - health monitoring, instant imports, quality upgrades, request integration
 Home-page: https://github.com/Feramance/qBitrr
 Author: Feramance

{qbitrr2-5.8.4 → qbitrr2-5.8.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = qBitrr2
-version = 5.8.4
+version = 5.8.6
 description = Intelligent automation for qBittorrent and *Arr apps (Radarr/Sonarr/Lidarr) - health monitoring, instant imports, quality upgrades, request integration
 long_description = file: README.md
 long_description_content_type = text/markdown