Refactor search_queue -> search/queue

sickbeard/__init__.py

@@ -41,7 +41,7 @@
 from sickbeard import naming
 from sickbeard import providers
 from sickbeard import scheduler
-from sickbeard import search_queue
+from sickbeard import queue
 from sickbeard import (
     showUpdater, versionChecker, proper, auto_postprocessor, subtitles, traktChecker,
 )
@@ -60,7 +60,7 @@
     indexer_error, indexer_episodenotfound, indexer_attributenotfound, indexer_seasonnotfound, indexer_userabort
 from sickbeard.providers.newznab import NewznabProvider
 from sickbeard.providers.rsstorrent import TorrentRssProvider
-from sickbeard.search import backlog, daily, proper
+from sickbeard.search import backlog, daily, proper, queue
 from sickrage.helper.encoding import ek
 from sickrage.helper.exceptions import ex
 from sickrage.providers.GenericProvider import GenericProvider
@@ -1389,15 +1389,15 @@ def path_leaf(path):
                                                   start_time=datetime.time(hour=SHOWUPDATE_HOUR, minute=random.randint(0, 59)))
 
         # snatcher used for manual search, manual picked results
-        manualSnatchScheduler = scheduler.Scheduler(search_queue.SnatchQueue(),
+        manualSnatchScheduler = scheduler.Scheduler(queue.SnatchQueue(),
                                                     cycleTime=datetime.timedelta(seconds=3),
                                                     threadName="MANUALSNATCHQUEUE")
         # searchers
-        searchQueueScheduler = scheduler.Scheduler(search_queue.SearchQueue(),
+        searchQueueScheduler = scheduler.Scheduler(queue.SearchQueue(),
                                                    cycleTime=datetime.timedelta(seconds=3),
                                                    threadName="SEARCHQUEUE")
 
-        forcedSearchQueueScheduler = scheduler.Scheduler(search_queue.ForcedSearchQueue(),
+        forcedSearchQueueScheduler = scheduler.Scheduler(queue.ForcedSearchQueue(),
                                                          cycleTime=datetime.timedelta(seconds=3),
                                                          threadName="FORCEDSEARCHQUEUE")
 

sickbeard/failedProcessor.py

@@ -21,8 +21,8 @@
 import sickbeard
 from sickbeard import logger
 from sickbeard import show_name_helpers
-from sickbeard import search_queue
 from sickbeard.name_parser.parser import NameParser, InvalidNameException, InvalidShowException
+from sickbeard.search import queue
 from sickrage.helper.exceptions import FailedPostProcessingFailedException
 
 
@@ -69,7 +69,7 @@ def process(self):
         for episode in parsed.episode_numbers:
             segment = parsed.show.get_episode(parsed.season_number, episode)
 
-            cur_failed_queue_item = search_queue.FailedQueueItem(parsed.show, [segment])
+            cur_failed_queue_item = queue.FailedQueueItem(parsed.show, [segment])
             sickbeard.forcedSearchQueueScheduler.action.add_item(cur_failed_queue_item)
 
         return True

sickbeard/search/backlog.py

@@ -25,8 +25,9 @@
 
 import sickbeard
 from sickbeard import (
-    db, scheduler, search_queue, logger, ui, common,
+    db, scheduler, logger, ui, common,
 )
+from sickbeard.search import queue
 
 
 class BacklogSearchScheduler(scheduler.Scheduler):
@@ -105,7 +106,7 @@ def searchBacklog(self, which_shows=None):
             for season, segment in iteritems(segments):
                 self.currentSearchInfo = {'title': curShow.name + " Season " + str(season)}
 
-                backlog_queue_item = search_queue.BacklogQueueItem(curShow, segment)
+                backlog_queue_item = queue.BacklogQueueItem(curShow, segment)
                 sickbeard.searchQueueScheduler.action.add_item(backlog_queue_item)  # @UndefinedVariable
 
             if not segments:

sickbeard/search/daily.py

@@ -20,12 +20,12 @@
 
 from __future__ import unicode_literals
 
+import threading
 from datetime import (
     date,
     datetime,
     timedelta,
 )
-import threading
 
 import sickbeard
 from sickbeard import (
@@ -39,10 +39,10 @@
     sb_timezone,
     parse_date_time,
 )
-from sickbeard.search_queue import DailySearchQueueItem
-from sickrage.show.Show import Show
-from sickrage.helper.exceptions import MultipleShowObjectsException
+from sickbeard.search.queue import DailySearchQueueItem
 from sickrage.helper.common import try_int
+from sickrage.helper.exceptions import MultipleShowObjectsException
+from sickrage.show.Show import Show
 
 
 class DailySearcher(object):  # pylint:disable=too-few-public-methods

sickbeard/search/manual.py

@@ -19,14 +19,15 @@
 # along with SickRage. If not, see <http://www.gnu.org/licenses/>.
 
 
+import json
+import threading
 import time
+
 import sickbeard
-import threading
-import json
-from sickbeard import search_queue
-from sickbeard.common import Quality, Overview, statusStrings, cpu_presets
 from sickbeard import logger, db
-from sickrage.helper.common import try_int, enabled_providers
+from sickbeard.common import Quality, Overview, statusStrings, cpu_presets
+from sickbeard.search import queue
+from sickrage.helper.common import enabled_providers
 from sickrage.show.Show import Show
 
 SEARCH_STATUS_FINISHED = "finished"
@@ -118,11 +119,11 @@ def update_finished_search_queue_item(snatch_queue_item):
     """
     # Finished Searches
 
-    for search_thread in sickbeard.search_queue.FORCED_SEARCH_HISTORY:
+    for search_thread in sickbeard.search.queue.FORCED_SEARCH_HISTORY:
         if snatch_queue_item.show and not search_thread.show.indexerid == snatch_queue_item.show.indexerid:
             continue
 
-        if isinstance(search_thread, sickbeard.search_queue.ForcedSearchQueueItem):
+        if isinstance(search_thread, sickbeard.search.queue.ForcedSearchQueueItem):
             if not isinstance(search_thread.segment, list):
                 search_thread.segment = [search_thread.segment]
 
@@ -160,11 +161,11 @@ def collectEpisodesFromSearchThread(show):
 
     # Finished Searches
     searchstatus = SEARCH_STATUS_FINISHED
-    for search_thread in sickbeard.search_queue.FORCED_SEARCH_HISTORY:
+    for search_thread in sickbeard.search.queue.FORCED_SEARCH_HISTORY:
         if show and not search_thread.show.indexerid == int(show):
             continue
 
-        if isinstance(search_thread, sickbeard.search_queue.ForcedSearchQueueItem):
+        if isinstance(search_thread, sickbeard.search.queue.ForcedSearchQueueItem):
             if not [x for x in episodes if x['episodeindexid'] in [search.indexerid for search in search_thread.segment]]:
                 episodes += getEpisodes(search_thread, searchstatus)
         else:
@@ -258,7 +259,7 @@ def get_provider_cache_results(indexer, show_all_results=None, perform_search=No
             and episode: {1}x{2}'.format(show_obj.name, season, episode)
 
         # make a queue item for it and put it on the queue
-        ep_queue_item = search_queue.ForcedSearchQueueItem(ep_obj.show, [ep_obj], bool(int(down_cur_quality)), True, manual_search_type)  # pylint: disable=maybe-no-member
+        ep_queue_item = queue.ForcedSearchQueueItem(ep_obj.show, [ep_obj], bool(int(down_cur_quality)), True, manual_search_type)  # pylint: disable=maybe-no-member
 
         sickbeard.forcedSearchQueueScheduler.action.add_item(ep_queue_item)
 

sickbeard/server/api/core.py

@@ -23,14 +23,14 @@
 # pylint: disable=line-too-long,too-many-lines,abstract-method
 # pylint: disable=no-member,method-hidden,missing-docstring,invalid-name
 
-from collections import OrderedDict
-from datetime import datetime, date
 import io
 import json
 import os
 import re
 import time
 import traceback
+from collections import OrderedDict
+from datetime import datetime, date
 
 from requests.compat import unquote_plus
 from six import iteritems, text_type
@@ -39,15 +39,15 @@
 import sickbeard
 from sickbeard import (
     classes, db, helpers, image_cache, logger, network_timezones,
-    processTV, sbdatetime, search_queue, ui,
+    processTV, sbdatetime, ui,
 )
 from sickbeard.common import (
     Overview, Quality, statusStrings,
     ARCHIVED, DOWNLOADED, FAILED, IGNORED, SKIPPED, SNATCHED, SNATCHED_PROPER,
     UNAIRED, UNKNOWN, WANTED,
 )
+from sickbeard.search import queue
 from sickbeard.versionChecker import CheckVersion
-
 from sickrage.helper.common import (
     dateFormat, dateTimeFormat, pretty_file_size, sanitize_filename,
     timeFormat, try_int,
@@ -59,17 +59,16 @@
     ShowDirectoryNotFoundException,
 )
 from sickrage.helper.quality import get_quality_string
+from sickrage.media.ShowBanner import ShowBanner
 from sickrage.media.ShowFanArt import ShowFanArt
 from sickrage.media.ShowNetworkLogo import ShowNetworkLogo
 from sickrage.media.ShowPoster import ShowPoster
-from sickrage.media.ShowBanner import ShowBanner
 from sickrage.show.ComingEpisodes import ComingEpisodes
 from sickrage.show.History import History
 from sickrage.show.Show import Show
 from sickrage.system.Restart import Restart
 from sickrage.system.Shutdown import Shutdown
 
-
 indexer_ids = ["indexerid", "tvdbid"]
 
 # basically everything except RESULT_SUCCESS / success is bad
@@ -783,7 +782,7 @@ def run(self):
             return _responds(RESULT_FAILURE, msg="Episode not found")
 
         # make a queue item for it and put it on the queue
-        ep_queue_item = search_queue.ForcedSearchQueueItem(show_obj, [ep_obj])
+        ep_queue_item = queue.ForcedSearchQueueItem(show_obj, [ep_obj])
         sickbeard.forcedSearchQueueScheduler.action.add_item(ep_queue_item)  # @UndefinedVariable
 
         # wait until the queue item tells us whether it worked or not
@@ -903,7 +902,7 @@ def _ep_result(result_code, ep, msg=""):
         extra_msg = ""
         if start_backlog:
             for season, segment in iteritems(segments):
-                cur_backlog_queue_item = search_queue.BacklogQueueItem(show_obj, segment)
+                cur_backlog_queue_item = queue.BacklogQueueItem(show_obj, segment)
                 sickbeard.searchQueueScheduler.action.add_item(cur_backlog_queue_item)  # @UndefinedVariable
 
                 logger.log(u"API :: Starting backlog for " + show_obj.name + " season " + str(

sickbeard/server/web/home/handler.py

@@ -17,8 +17,7 @@
 import sickbeard
 from sickbeard import (
     clients, config, db, helpers, logger,
-    notifiers, sab, search_queue,
-    subtitles, ui, show_name_helpers,
+    notifiers, sab, subtitles, ui, show_name_helpers,
 )
 from sickbeard.blackandwhitelist import BlackAndWhiteList, short_group_names
 from sickbeard.common import (
@@ -36,6 +35,7 @@
     get_xem_absolute_numbering_for_show, get_xem_numbering_for_show,
     set_scene_numbering,
 )
+from sickbeard.search import queue
 from sickbeard.search.manual import (
     collectEpisodesFromSearchThread, get_provider_cache_results, getEpisode, update_finished_search_queue_item,
     SEARCH_STATUS_FINISHED, SEARCH_STATUS_SEARCHING, SEARCH_STATUS_QUEUED,
@@ -952,7 +952,7 @@ def pickManualSearch(self, provider=None, rowid=None, manual_search_type='episod
                 ep_objs.append(show_obj.get_episode(int(cached_result[b'season']), int(episode)))
 
         # Create the queue item
-        snatch_queue_item = search_queue.ManualSnatchQueueItem(show_obj, ep_objs, provider, cached_result)
+        snatch_queue_item = queue.ManualSnatchQueueItem(show_obj, ep_objs, provider, cached_result)
 
         # Add the queue item to the queue
         sickbeard.manualSnatchScheduler.action.add_item(snatch_queue_item)
@@ -1726,7 +1726,7 @@ def setStatus(self, show=None, eps=None, status=None, direct=False):
             msg += '<ul>'
 
             for season, segment in iteritems(segments):
-                cur_backlog_queue_item = search_queue.BacklogQueueItem(show_obj, segment)
+                cur_backlog_queue_item = queue.BacklogQueueItem(show_obj, segment)
                 sickbeard.searchQueueScheduler.action.add_item(cur_backlog_queue_item)
 
                 msg += '<li>Season {season}</li>'.format(season=season)
@@ -1748,7 +1748,7 @@ def setStatus(self, show=None, eps=None, status=None, direct=False):
             msg += '<ul>'
 
             for season, segment in iteritems(segments):
-                cur_failed_queue_item = search_queue.FailedQueueItem(show_obj, segment)
+                cur_failed_queue_item = queue.FailedQueueItem(show_obj, segment)
                 sickbeard.searchQueueScheduler.action.add_item(cur_failed_queue_item)
 
                 msg += '<li>Season {season}</li>'.format(season=season)
@@ -1875,7 +1875,7 @@ def searchEpisode(self, show=None, season=None, episode=None, manual_search=None
             })
 
         # make a queue item for it and put it on the queue
-        ep_queue_item = search_queue.ForcedSearchQueueItem(ep_obj.show, [ep_obj], bool(int(down_cur_quality)), bool(manual_search))
+        ep_queue_item = queue.ForcedSearchQueueItem(ep_obj.show, [ep_obj], bool(int(down_cur_quality)), bool(manual_search))
 
         sickbeard.forcedSearchQueueScheduler.action.add_item(ep_queue_item)
 
@@ -2030,7 +2030,7 @@ def retryEpisode(self, show, season, episode, down_cur_quality=0):
             })
 
         # make a queue item for it and put it on the queue
-        ep_queue_item = search_queue.FailedQueueItem(ep_obj.show, [ep_obj], bool(int(down_cur_quality)))  # pylint: disable=no-member
+        ep_queue_item = queue.FailedQueueItem(ep_obj.show, [ep_obj], bool(int(down_cur_quality)))  # pylint: disable=no-member
         sickbeard.forcedSearchQueueScheduler.action.add_item(ep_queue_item)
 
         if not ep_queue_item.started and ep_queue_item.success is None:

sickbeard/traktChecker.py

@@ -17,19 +17,19 @@
 # You should have received a copy of the GNU General Public License
 # along with SickRage. If not, see <http://www.gnu.org/licenses/>.
 
+import datetime
 import os
 import traceback
-import datetime
-from libtrakt.exceptions import traktException # pylint: disable=import-error
+
 from libtrakt import TraktAPI # pylint: disable=import-error
+from libtrakt.exceptions import traktException # pylint: disable=import-error
 
 import sickbeard
-from sickbeard import logger
-from sickbeard import helpers
-from sickbeard import search_queue
 from sickbeard import db
+from sickbeard import helpers
+from sickbeard import logger
 from sickbeard.common import SKIPPED, UNKNOWN, WANTED, Quality
-
+from sickbeard.search import queue
 from sickrage.helper.common import episode_num
 from sickrage.helper.encoding import ek
 from sickrage.helper.exceptions import ex
@@ -54,7 +54,7 @@ def setEpisodeToWanted(show, s, e):
             ep_obj.status = WANTED
             ep_obj.save_to_db()
 
-        cur_backlog_queue_item = search_queue.BacklogQueueItem(show, [ep_obj])
+        cur_backlog_queue_item = queue.BacklogQueueItem(show, [ep_obj])
         sickbeard.searchQueueScheduler.action.add_item(cur_backlog_queue_item)
 
         logger.log(u"Starting backlog search for {show} {ep} because some episodes were set to wanted".format