From ef4782ccf25556039db1d60e149ac81216b82c95 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 18 Aug 2014 08:15:02 +0800 Subject: [PATCH] Third fix for zip updating and checkouts... --- sickbeard/__init__.py | 10 ++++++++-- sickbeard/versionChecker.py | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index b4c47c6b..00621f53 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -102,6 +102,7 @@ AUTO_UPDATE = False NOTIFY_ON_UPDATE = False CUR_COMMIT_HASH = None BRANCH = '' +CUR_COMMIT_BRANCH = '' INIT_LOCK = Lock() started = False @@ -444,7 +445,7 @@ __INITIALIZED__ = False def initialize(consoleLogging=True): with INIT_LOCK: - global BRANCH, CUR_COMMIT_HASH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ + global BRANCH, CUR_COMMIT_HASH, CUR_COMMIT_BRANCH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \ SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \ NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \ @@ -511,13 +512,17 @@ def initialize(consoleLogging=True): CheckSection(CFG, 'Pushbullet') CheckSection(CFG, 'Subtitles') - # branch + # wanted branch BRANCH = check_setting_str(CFG, 'General', 'branch', '') # current commit hash CUR_COMMIT_HASH = check_setting_str(CFG, 'General', 'cur_commit_hash', '') + # current commit branch + CUR_COMMIT_BRANCH = check_setting_str(CFG, 'General', 'cur_commit_branch', '') + ACTUAL_CACHE_DIR = check_setting_str(CFG, 'General', 'cache_dir', 'cache') + # fix bad configs due to buggy code if ACTUAL_CACHE_DIR == 'None': ACTUAL_CACHE_DIR = 'cache' @@ -1310,6 +1315,7 @@ def save_config(): new_config['General'] = {} new_config['General']['branch'] = BRANCH new_config['General']['cur_commit_hash'] = CUR_COMMIT_HASH + new_config['General']['cur_commit_branch'] = CUR_COMMIT_BRANCH new_config['General']['config_version'] = CONFIG_VERSION new_config['General']['encryption_version'] = int(ENCRYPTION_VERSION) new_config['General']['log_dir'] = ACTUAL_LOG_DIR if ACTUAL_LOG_DIR else 'Logs' diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py index 8f101e70..33524a53 100644 --- a/sickbeard/versionChecker.py +++ b/sickbeard/versionChecker.py @@ -571,10 +571,10 @@ class SourceUpdateManager(UpdateManager): self._num_commits_behind = 0 def _find_installed_branch(self): - if sickbeard.BRANCH == "": + if sickbeard.CUR_COMMIT_BRANCH == "": return "master" - - return "" + else: + return sickbeard.CUR_COMMIT_BRANCH def need_update(self): # need this to run first to set self._newest_commit_hash @@ -738,6 +738,7 @@ class SourceUpdateManager(UpdateManager): os.renames(old_path, new_path) sickbeard.CUR_COMMIT_HASH = self._newest_commit_hash + sickbeard.CUR_COMMIT_BRANCH = self.branch except Exception, e: logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)