From 36b3bb9a2493407b994c54790b9ab2da5073301e Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 4 Jan 2015 10:26:55 +0800 Subject: [PATCH] Change recent and backlog search timing Remove recent and backlog search at start up options from GUI Change recent and backlog search at start up default value to false Change recent search to occur 5 minutes after start up Change backlog search to occur 10 minutes after start up Change UI footer to display time left until a backlog search --- CHANGES.md | 5 +++++ .../interfaces/default/config_search.tmpl | 20 ------------------- gui/slick/interfaces/default/inc_bottom.tmpl | 2 +- sickbeard/__init__.py | 12 +++++------ sickbeard/config.py | 5 +++++ sickbeard/searchBacklog.py | 2 ++ sickbeard/webserve.py | 4 ---- 7 files changed, 19 insertions(+), 31 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b79578fb..eb8570c0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,11 @@ * Fix slow database operations (port from midgetspy/sickbeard) * Add TVRage network name standardization +* Remove recent and backlog search at start up options from GUI +* Change recent and backlog search at start up default value to false +* Change recent search to occur 5 minutes after start up +* Change backlog search to occur 10 minutes after start up +* Change UI footer to display time left until a backlog search [develop changelog] diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl index 92cc1e79..812ea942 100755 --- a/gui/slick/interfaces/default/config_search.tmpl +++ b/gui/slick/interfaces/default/config_search.tmpl @@ -138,26 +138,6 @@ -
- -
- -
- -
- diff --git a/gui/slick/interfaces/default/inc_bottom.tmpl b/gui/slick/interfaces/default/inc_bottom.tmpl index 9d8d38a8..7d1624ff 100644 --- a/gui/slick/interfaces/default/inc_bottom.tmpl +++ b/gui/slick/interfaces/default/inc_bottom.tmpl @@ -63,7 +63,7 @@ %>  / $ep_total episodes downloaded | recent search: <%= str(sickbeard.recentSearchScheduler.timeLeft()).split('.')[0] %> - | backlog search: $sbdatetime.sbdatetime.sbfdate($sickbeard.backlogSearchScheduler.nextRun()) + | backlog search: <%= str(sickbeard.backlogSearchScheduler.timeLeft()).split('.')[0] %> diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 1ac49e1e..f4df508e 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -58,7 +58,7 @@ CFG = None CONFIG_FILE = None # This is the version of the config we EXPECT to find -CONFIG_VERSION = 7 +CONFIG_VERSION = 8 # Default encryption version (0 for None) ENCRYPTION_VERSION = 0 @@ -674,8 +674,8 @@ def initialize(consoleLogging=True): ALLOW_HIGH_PRIORITY = bool(check_setting_int(CFG, 'General', 'allow_high_priority', 1)) - RECENTSEARCH_STARTUP = bool(check_setting_int(CFG, 'General', 'recentsearch_startup', 1)) - BACKLOG_STARTUP = bool(check_setting_int(CFG, 'General', 'backlog_startup', 1)) + RECENTSEARCH_STARTUP = bool(check_setting_int(CFG, 'General', 'recentsearch_startup', 0)) + BACKLOG_STARTUP = bool(check_setting_int(CFG, 'General', 'backlog_startup', 0)) SKIP_REMOVED_FILES = bool(check_setting_int(CFG, 'General', 'skip_removed_files', 0)) USENET_RETENTION = check_setting_int(CFG, 'General', 'usenet_retention', 500) @@ -1052,7 +1052,7 @@ def initialize(consoleLogging=True): if hasattr(curNzbProvider, 'enable_recentsearch'): curNzbProvider.enable_recentsearch = bool(check_setting_int(CFG, curNzbProvider.getID().upper(), curNzbProvider.getID() + '_enable_recentsearch', - 1)) + 1)) if hasattr(curNzbProvider, 'enable_backlog'): curNzbProvider.enable_backlog = bool(check_setting_int(CFG, curNzbProvider.getID().upper(), curNzbProvider.getID() + '_enable_backlog', @@ -1127,14 +1127,14 @@ def initialize(consoleLogging=True): cycleTime=update_interval, threadName="RECENTSEARCHER", run_delay=update_now if RECENTSEARCH_STARTUP - else update_interval) + else datetime.timedelta(minutes=5)) update_interval = datetime.timedelta(minutes=BACKLOG_FREQUENCY) backlogSearchScheduler = searchBacklog.BacklogSearchScheduler(searchBacklog.BacklogSearcher(), cycleTime=update_interval, threadName="BACKLOG", run_delay=update_now if BACKLOG_STARTUP - else update_interval) + else datetime.timedelta(minutes=10)) search_intervals = {'15m': 15, '45m': 45, '90m': 90, '4h': 4 * 60, 'daily': 24 * 60} if CHECK_PROPERS_INTERVAL in search_intervals: diff --git a/sickbeard/config.py b/sickbeard/config.py index 322861d4..9e30f573 100644 --- a/sickbeard/config.py +++ b/sickbeard/config.py @@ -740,3 +740,8 @@ class ConfigMigrator(): sickbeard.EPISODE_VIEW_SORT = 'time' sickbeard.EPISODE_VIEW_DISPLAY_PAUSED = bool(check_setting_int(self.config_obj, 'GUI', 'coming_eps_display_paused', 0)) sickbeard.EPISODE_VIEW_MISSED_RANGE = check_setting_int(self.config_obj, 'GUI', 'coming_eps_missed_range', 7) + + def _migrate_v8(self): + # removing settings from gui and making it a hidden debug option + sickbeard.RECENTSEARCH_STARTUP = False + sickbeard.BACKLOG_STARTUP = False \ No newline at end of file diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py index 66eb489b..335ae34b 100644 --- a/sickbeard/searchBacklog.py +++ b/sickbeard/searchBacklog.py @@ -38,6 +38,8 @@ class BacklogSearchScheduler(scheduler.Scheduler): def nextRun(self): if self.action._lastBacklog <= 1: return datetime.date.today() + elif (self.action._lastBacklog + self.action.cycleTime) < datetime.date.today().toordinal(): + return datetime.date.today() else: return datetime.date.fromordinal(self.action._lastBacklog + self.action.cycleTime) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 71e7471b..287c9824 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1630,7 +1630,6 @@ class ConfigSearch(MainHandler): backlog_days=None, backlog_frequency=None, recentsearch_frequency=None, nzb_method=None, torrent_method=None, usenet_retention=None, download_propers=None, check_propers_interval=None, allow_high_priority=None, - backlog_startup=None, recentsearch_startup=None, torrent_dir=None, torrent_username=None, torrent_password=None, torrent_host=None, torrent_label=None, torrent_path=None, torrent_verify_cert=None, torrent_seed_time=None, torrent_paused=None, torrent_high_bandwidth=None, ignore_words=None, require_words=None): @@ -1663,9 +1662,6 @@ class ConfigSearch(MainHandler): sickbeard.ALLOW_HIGH_PRIORITY = config.checkbox_to_value(allow_high_priority) - sickbeard.RECENTSEARCH_STARTUP = config.checkbox_to_value(recentsearch_startup) - sickbeard.BACKLOG_STARTUP = config.checkbox_to_value(backlog_startup) - sickbeard.SAB_USERNAME = sab_username sickbeard.SAB_PASSWORD = sab_password sickbeard.SAB_APIKEY = sab_apikey.strip()