From 5b1dc8b1ffe37f09e09e2bc83e8e35fec9c1b2de Mon Sep 17 00:00:00 2001 From: shypike Date: Sat, 16 Apr 2016 18:10:14 +0200 Subject: [PATCH] Revert "Harmonize checks in has_articles_for and get_article" This reverts commit e2cc5ea3ca20482fcb1e8376b8b71efb1dd93b7a. --- sabnzbd/nzbqueue.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sabnzbd/nzbqueue.py b/sabnzbd/nzbqueue.py index 23cb03b..b0551d6 100644 --- a/sabnzbd/nzbqueue.py +++ b/sabnzbd/nzbqueue.py @@ -752,11 +752,9 @@ class NzbQueue(TryList): return False # Check if this server is allowed for any object, then return if we've tried this server. for nzo in self.__nzo_list: - # Not when queue paused and not a forced item - if (nzo.status not in (Status.PAUSED, Status.GRABBING) and not sabnzbd.downloader.Downloader.do.paused) or nzo.priority == TOP_PRIORITY: + if nzo.status not in (Status.PAUSED, Status.GRABBING): # Check if past propagation delay if not cfg.propagation_delay() or (nzo.avg_stamp + float(cfg.propagation_delay() * 60)) < time.time(): - # Check if category allowed if nzo.server_allowed(server) or self.__top_only: return not self.server_in_try_list(server) return False @@ -778,8 +776,8 @@ class NzbQueue(TryList): if (nzo.status not in (Status.PAUSED, Status.GRABBING) and not sabnzbd.downloader.Downloader.do.paused) or nzo.priority == TOP_PRIORITY: # Check if past propagation delay if not cfg.propagation_delay() or (nzo.avg_stamp + float(cfg.propagation_delay() * 60)) < time.time(): - # Don't try to get an article if server is in try_list of nzo and category allowed by server - if nzo.server_allowed(server) and (not nzo.server_in_try_list(server) or self.__top_only): + # Don't try to get an article if server is in try_list of nzo + if (not nzo.server_in_try_list(server) or self.__top_only) and nzo.server_allowed(server): article = nzo.get_article(server, servers) if article: return article