From f5d3f71c70c5ea30356fae58bde2577b96c26023 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 8 Sep 2014 10:48:48 +0800 Subject: [PATCH] Add search queue info to ManageSearches page --- .../interfaces/default/manage_manageSearches.tmpl | 11 ++++++++++- sickbeard/search_queue.py | 14 ++++++++++++++ sickbeard/webserve.py | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gui/slick/interfaces/default/manage_manageSearches.tmpl b/gui/slick/interfaces/default/manage_manageSearches.tmpl index dc958d0a..5b78a29f 100644 --- a/gui/slick/interfaces/default/manage_manageSearches.tmpl +++ b/gui/slick/interfaces/default/manage_manageSearches.tmpl @@ -47,6 +47,15 @@ In Progress

Version Check:

Force Check -
+

+ +

Search Queue:

+Backlog: $queueLength['backlog'] pending items
+Daily: $queueLength['daily'] pending items
+Manual: $queueLength['manual'] pending items
+Failed: $queueLength['failed'] pending items
+ + + #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_bottom.tmpl") diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py index f021bdb7..581c1a7e 100644 --- a/sickbeard/search_queue.py +++ b/sickbeard/search_queue.py @@ -77,6 +77,20 @@ class SearchQueue(generic_queue.GenericQueue): return True return False + def queue_length(self): + length = {'backlog': 0, 'daily': 0, 'manual': 0, 'failed': 0} + for cur_item in self.queue: + if isinstance(cur_item, DailySearchQueueItem): + length['backlog'] += 1 + elif isinstance(cur_item, BacklogQueueItem): + length['daily'] += 1 + elif isinstance(cur_item, ManualSearchQueueItem): + length['manual'] += 1 + elif isinstance(cur_item, FailedQueueItem): + length['failed'] += 1 + return length + + def add_item(self, item): if isinstance(item, DailySearchQueueItem): # daily searches diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 1826cb95..44dfcf74 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -596,6 +596,7 @@ class ManageSearches(MainHandler): t.backlogRunning = sickbeard.searchQueueScheduler.action.is_backlog_in_progress() # @UndefinedVariable t.dailySearchStatus = sickbeard.dailySearchScheduler.action.amActive # @UndefinedVariable t.findPropersStatus = sickbeard.properFinderScheduler.action.amActive # @UndefinedVariable + t.queueLength = sickbeard.searchQueueScheduler.action.queue_length() t.submenu = ManageMenu()