diff --git a/SickBeard.py b/SickBeard.py index ad80ee6a..21fa9c11 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -79,15 +79,15 @@ def loadShowsFromDB(): with db.DBConnection() as myDB: sqlResults = myDB.select("SELECT * FROM tv_shows") - for sqlShow in sqlResults: - try: - curShow = TVShow(int(sqlShow["indexer"]), int(sqlShow["indexer_id"])) - sickbeard.showList.append(curShow) - except Exception, e: - logger.log( - u"There was an error creating the show in " + sqlShow["location"] + ": " + str(e).decode('utf-8'), - logger.ERROR) - logger.log(traceback.format_exc(), logger.DEBUG) + for sqlShow in sqlResults: + try: + curShow = TVShow(int(sqlShow["indexer"]), int(sqlShow["indexer_id"])) + sickbeard.showList.append(curShow) + except Exception, e: + logger.log( + u"There was an error creating the show in " + sqlShow["location"] + ": " + str(e).decode('utf-8'), + logger.ERROR) + logger.log(traceback.format_exc(), logger.DEBUG) # TODO: update the existing shows if the showlist has something in it diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl index b4e7355c..2c8fd6ca 100644 --- a/gui/slick/interfaces/default/home.tmpl +++ b/gui/slick/interfaces/default/home.tmpl @@ -170,7 +170,7 @@ -#for $curShowlist in $showlists if $varExists('showlists') else $sickbeard.showList +#for $curShowlist in $showlists: #set $curListType = $curShowlist[0] #set $myShowList = $list($curShowlist[1]) #if $curListType == "Anime": @@ -179,7 +179,7 @@ - #if $layout=="poster" then "" else ""# + #if $layout=="poster" then "" else ""# diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 070d1b12..e4a0634d 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -85,9 +85,9 @@ versionCheckScheduler = None showQueueScheduler = None searchQueueScheduler = None properFinderScheduler = None -autoPostProcesserScheduler = None +autoPostProcessorScheduler = None subtitlesFinderScheduler = None -traktWatchListCheckerSchedular = None +traktWatchListCheckerScheduler = None showList = None loadingShowList = None @@ -432,6 +432,7 @@ TMDB_API_KEY = 'edc5f123313769de83a71e157758030b' __INITIALIZED__ = False + def initialize(consoleLogging=True): with INIT_LOCK: @@ -442,7 +443,7 @@ def initialize(consoleLogging=True): TORRENT_USERNAME, TORRENT_PASSWORD, TORRENT_HOST, TORRENT_PATH, TORRENT_SEED_TIME, TORRENT_PAUSED, TORRENT_HIGH_BANDWIDTH, TORRENT_LABEL, TORRENT_VERIFY_CERT, \ USE_XBMC, XBMC_ALWAYS_ON, XBMC_NOTIFY_ONSNATCH, XBMC_NOTIFY_ONDOWNLOAD, XBMC_NOTIFY_ONSUBTITLEDOWNLOAD, XBMC_UPDATE_FULL, XBMC_UPDATE_ONLYFIRST, \ XBMC_UPDATE_LIBRARY, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, BACKLOG_FREQUENCY, \ - USE_TRAKT, TRAKT_USERNAME, TRAKT_PASSWORD, TRAKT_API, TRAKT_REMOVE_WATCHLIST, TRAKT_USE_WATCHLIST, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, traktWatchListCheckerSchedular, \ + USE_TRAKT, TRAKT_USERNAME, TRAKT_PASSWORD, TRAKT_API, TRAKT_REMOVE_WATCHLIST, TRAKT_USE_WATCHLIST, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, traktWatchListCheckerScheduler, \ USE_PLEX, PLEX_NOTIFY_ONSNATCH, PLEX_NOTIFY_ONDOWNLOAD, PLEX_NOTIFY_ONSUBTITLEDOWNLOAD, PLEX_UPDATE_LIBRARY, \ PLEX_SERVER_HOST, PLEX_HOST, PLEX_USERNAME, PLEX_PASSWORD, DEFAULT_BACKLOG_FREQUENCY, MIN_BACKLOG_FREQUENCY, BACKLOG_STARTUP, SKIP_REMOVED_FILES, \ showUpdateScheduler, __INITIALIZED__, LAUNCH_BROWSER, UPDATE_SHOWS_ON_START, SORT_ARTICLE, showList, loadingShowList, \ @@ -458,7 +459,7 @@ def initialize(consoleLogging=True): KEEP_PROCESSED_DIR, PROCESS_METHOD, TV_DOWNLOAD_DIR, MIN_DAILYSEARCH_FREQUENCY, DEFAULT_UPDATE_FREQUENCY, MIN_UPDATE_FREQUENCY, UPDATE_FREQUENCY, \ showQueueScheduler, searchQueueScheduler, ROOT_DIRS, CACHE_DIR, ACTUAL_CACHE_DIR, TIMEZONE_DISPLAY, \ NAMING_PATTERN, NAMING_MULTI_EP, NAMING_FORCE_FOLDERS, NAMING_ABD_PATTERN, NAMING_CUSTOM_ABD, NAMING_SPORTS_PATTERN, NAMING_CUSTOM_SPORTS, NAMING_STRIP_YEAR, \ - RENAME_EPISODES, AIRDATE_EPISODES, properFinderScheduler, PROVIDER_ORDER, autoPostProcesserScheduler, \ + RENAME_EPISODES, AIRDATE_EPISODES, properFinderScheduler, PROVIDER_ORDER, autoPostProcessorScheduler, \ WOMBLE, OMGWTFNZBS, OMGWTFNZBS_USERNAME, OMGWTFNZBS_APIKEY, providerList, newznabProviderList, torrentRssProviderList, \ EXTRA_SCRIPTS, USE_TWITTER, TWITTER_USERNAME, TWITTER_PASSWORD, TWITTER_PREFIX, DAILYSEARCH_FREQUENCY, \ USE_BOXCAR, BOXCAR_USERNAME, BOXCAR_PASSWORD, BOXCAR_NOTIFY_ONDOWNLOAD, BOXCAR_NOTIFY_ONSUBTITLEDOWNLOAD, BOXCAR_NOTIFY_ONSNATCH, \ @@ -948,28 +949,28 @@ def initialize(consoleLogging=True): silent=True, runImmediately=True) + versionCheckScheduler = scheduler.Scheduler(versionChecker.CheckVersion(), + cycleTime=datetime.timedelta(hours=UPDATE_FREQUENCY), + threadName="CHECKVERSION", + runImmediately=True) + dailySearchScheduler = scheduler.Scheduler(dailysearcher.DailySearcher(), cycleTime=datetime.timedelta(minutes=DAILYSEARCH_FREQUENCY), threadName="DAILYSEARCHER", silent=True, runImmediately=DAILYSEARCH_STARTUP) - showUpdateScheduler = scheduler.Scheduler(showUpdater.ShowUpdater(), - cycleTime=showUpdater.ShowUpdater().updateInterval, - threadName="SHOWUPDATER", - runImmediately=False) - - versionCheckScheduler = scheduler.Scheduler(versionChecker.CheckVersion(), - cycleTime=datetime.timedelta(hours=UPDATE_FREQUENCY), - threadName="CHECKVERSION", - runImmediately=True) - showQueueScheduler = scheduler.Scheduler(show_queue.ShowQueue(), cycleTime=datetime.timedelta(seconds=3), threadName="SHOWQUEUE", silent=True, runImmediately=True) + showUpdateScheduler = scheduler.Scheduler(showUpdater.ShowUpdater(), + cycleTime=showUpdater.ShowUpdater().updateInterval, + threadName="SHOWUPDATER", + runImmediately=False) + searchQueueScheduler = scheduler.Scheduler(search_queue.SearchQueue(), cycleTime=datetime.timedelta(seconds=3), threadName="SEARCHQUEUE", @@ -981,14 +982,14 @@ def initialize(consoleLogging=True): silent=False if DOWNLOAD_PROPERS else True, runImmediately=True) - autoPostProcesserScheduler = scheduler.Scheduler(autoPostProcesser.PostProcesser(), + autoPostProcessorScheduler = scheduler.Scheduler(autoPostProcesser.PostProcesser(), cycleTime=datetime.timedelta( minutes=AUTOPOSTPROCESSER_FREQUENCY), threadName="POSTPROCESSER", silent=False if PROCESS_AUTOMATICALLY else True, runImmediately=True) - traktWatchListCheckerSchedular = scheduler.Scheduler(traktWatchListChecker.TraktChecker(), + traktWatchListCheckerScheduler = scheduler.Scheduler(traktWatchListChecker.TraktChecker(), cycleTime=datetime.timedelta(hours=1), threadName="TRAKTWATCHLIST", silent=False if USE_TRAKT else True, @@ -1090,18 +1091,6 @@ def initialize(consoleLogging=True): curNzbProvider.getID() + '_backlog_only', 0)) - try: - url = 'http://raw.github.com/echel0n/sickrage-init/master/settings.ini' - clear_cache = ElementTree.XML(helpers.getURL(url)).find('cache/clear').text - CLEAR_CACHE = check_setting_str(CFG, 'General', 'clear_cache', '') - if CLEAR_CACHE != clear_cache: - for curProvider in [x for x in providers.sortedProviderList() if x.isActive()]: - curProvider.cache._clearCache() - CLEAR_CACHE = clear_cache - save_config() - except: - pass - showList = [] loadingShowList = {} @@ -1112,8 +1101,8 @@ def initialize(consoleLogging=True): def start(): global __INITIALIZED__, maintenanceScheduler, backlogSearchScheduler, \ showUpdateScheduler, versionCheckScheduler, showQueueScheduler, \ - properFinderScheduler, autoPostProcesserScheduler, searchQueueScheduler, \ - subtitlesFinderScheduler, USE_SUBTITLES,traktWatchListCheckerSchedular, \ + properFinderScheduler, autoPostProcessorScheduler, searchQueueScheduler, \ + subtitlesFinderScheduler, USE_SUBTITLES, traktWatchListCheckerScheduler, \ dailySearchScheduler, started with INIT_LOCK: @@ -1148,14 +1137,14 @@ def start(): properFinderScheduler.thread.start() # start the proper finder - autoPostProcesserScheduler.thread.start() + autoPostProcessorScheduler.thread.start() # start the subtitles finder if USE_SUBTITLES: subtitlesFinderScheduler.thread.start() # start the trakt watchlist - traktWatchListCheckerSchedular.thread.start() + traktWatchListCheckerScheduler.thread.start() started = True @@ -1163,8 +1152,8 @@ def start(): def halt(): global __INITIALIZED__, maintenanceScheduler, backlogSearchScheduler, \ showUpdateScheduler, versionCheckScheduler, showQueueScheduler, \ - properFinderScheduler, autoPostProcesserScheduler, searchQueueScheduler, \ - subtitlesFinderScheduler, traktWatchListCheckerSchedular, \ + properFinderScheduler, autoPostProcessorScheduler, searchQueueScheduler, \ + subtitlesFinderScheduler, traktWatchListCheckerScheduler, \ dailySearchScheduler, started with INIT_LOCK: @@ -1224,17 +1213,17 @@ def halt(): except: pass - autoPostProcesserScheduler.abort = True + autoPostProcessorScheduler.abort = True logger.log(u"Waiting for the POSTPROCESSER thread to exit") try: - autoPostProcesserScheduler.thread.join(10) + autoPostProcessorScheduler.thread.join(10) except: pass - traktWatchListCheckerSchedular.abort = True + traktWatchListCheckerScheduler.abort = True logger.log(u"Waiting for the TRAKTWATCHLIST thread to exit") try: - traktWatchListCheckerSchedular.thread.join(10) + traktWatchListCheckerScheduler.thread.join(10) except: pass @@ -1333,6 +1322,7 @@ def saveAndShutdown(restart=False): os._exit(0) + def invoke_command(to_call, *args, **kwargs): global invoked_command diff --git a/sickbeard/config.py b/sickbeard/config.py index 6d75c38a..d930379b 100644 --- a/sickbeard/config.py +++ b/sickbeard/config.py @@ -164,7 +164,7 @@ def change_AUTOPOSTPROCESSER_FREQUENCY(freq): if sickbeard.AUTOPOSTPROCESSER_FREQUENCY < sickbeard.MIN_AUTOPOSTPROCESSER_FREQUENCY: sickbeard.AUTOPOSTPROCESSER_FREQUENCY = sickbeard.MIN_AUTOPOSTPROCESSER_FREQUENCY - sickbeard.autoPostProcesserScheduler.cycleTime = datetime.timedelta(minutes=sickbeard.AUTOPOSTPROCESSER_FREQUENCY) + sickbeard.autoPostProcessorScheduler.cycleTime = datetime.timedelta(minutes=sickbeard.AUTOPOSTPROCESSER_FREQUENCY) def change_DAILYSEARCH_FREQUENCY(freq): sickbeard.DAILYSEARCH_FREQUENCY = to_int(freq, default=sickbeard.DEFAULT_DAILYSEARCH_FREQUENCY) diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py index 113722b1..cce175c5 100644 --- a/sickbeard/show_queue.py +++ b/sickbeard/show_queue.py @@ -386,7 +386,7 @@ class QueueItemAdd(ShowQueueItem): self.show.flushEpisodes() # if there are specific episodes that need to be added by trakt - sickbeard.traktWatchListCheckerSchedular.action.manageNewShow(self.show) + sickbeard.traktWatchListCheckerScheduler.action.manageNewShow(self.show) # Load XEM data to DB for show sickbeard.scene_numbering.xem_refresh(self.show.indexerid, self.show.indexer, force=True) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index c1ffe140..ea354148 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1245,9 +1245,9 @@ class ConfigPostProcessing: config.change_AUTOPOSTPROCESSER_FREQUENCY(autopostprocesser_frequency) if sickbeard.PROCESS_AUTOMATICALLY: - sickbeard.autoPostProcesserScheduler.silent = False + sickbeard.autoPostProcessorScheduler.silent = False else: - sickbeard.autoPostProcesserScheduler.silent = True + sickbeard.autoPostProcessorScheduler.silent = True if unpack: if self.isRarSupported() != 'not supported': @@ -1910,9 +1910,9 @@ class ConfigNotifications: sickbeard.TRAKT_START_PAUSED = config.checkbox_to_value(trakt_start_paused) if sickbeard.USE_TRAKT: - sickbeard.traktWatchListCheckerSchedular.silent = False + sickbeard.traktWatchListCheckerScheduler.silent = False else: - sickbeard.traktWatchListCheckerSchedular.silent = True + sickbeard.traktWatchListCheckerScheduler.silent = True sickbeard.USE_EMAIL = config.checkbox_to_value(use_email) sickbeard.EMAIL_NOTIFY_ONSNATCH = config.checkbox_to_value(email_notify_onsnatch)
Next EpPosterShowNetworkQualityDownloadsActiveStatus
Next EpPoster$curListTypeNetworkQualityDownloadsActiveStatus
  Add Show