From 9ae96e0985824cc2eb836802226e419103109fd1 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Mon, 18 Jul 2022 16:51:48 +0200 Subject: [PATCH 1/2] Ensure invalid sonarr queue items are just skipped over - fixes #239 --- varken/sonarr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varken/sonarr.py b/varken/sonarr.py index 1e8c2676..89bafa42 100644 --- a/varken/sonarr.py +++ b/varken/sonarr.py @@ -140,8 +140,8 @@ def get_queue(self): for queueItem in download_queue: tvShow = SonarrTVShow(**queueItem.series) - episode = SonarrEpisode(**queueItem.episode) try: + episode = SonarrEpisode(**queueItem.episode) sxe = f"S{episode.seasonNumber:0>2}E{episode.episodeNumber:0>2}" except TypeError as e: self.logger.error('TypeError has occurred : %s while processing the sonarr queue. \ From e6b6a8b8404ebc11b9043d2791fe281df041e61e Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Mon, 18 Jul 2022 17:07:12 +0200 Subject: [PATCH 2/2] add includeUnknownSeriesItems filter to sonarr queue --- varken/sonarr.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/varken/sonarr.py b/varken/sonarr.py index 89bafa42..f9b55c64 100644 --- a/varken/sonarr.py +++ b/varken/sonarr.py @@ -105,7 +105,8 @@ def get_queue(self): endpoint = '/api/v3/queue' now = datetime.now(timezone.utc).astimezone().isoformat() pageSize = 250 - params = {'pageSize': pageSize, 'includeSeries': True, 'includeEpisode': True} + params = {'pageSize': pageSize, 'includeSeries': True, 'includeEpisode': True, + 'includeUnknownSeriesItems': False} queueResponse = [] queue = [] @@ -119,7 +120,8 @@ def get_queue(self): while response.totalRecords > response.page * response.pageSize: page = response.page + 1 - params = {'pageSize': pageSize, 'page': page, 'includeSeries': True, 'includeEpisode': True} + params = {'pageSize': pageSize, 'page': page, 'includeSeries': True, 'includeEpisode': True, + 'includeUnknownSeriesItems': False} req = self.session.prepare_request(Request('GET', self.server.url + endpoint, params=params)) get = connection_handler(self.session, req, self.server.verify_ssl) if not get: