From 35af9acadb05dd853689372b88f79b0728785408 Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Fri, 12 Dec 2014 08:54:37 -0800
Subject: [PATCH] Fixed issues with network timezone downloads crashing on a
 empty return. Changed version checker url.

---
 gui/slick/interfaces/default/inc_top.tmpl |  2 +-
 sickbeard/__init__.py                     | 13 +++++++++----
 sickbeard/versionChecker.py               |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl
index a923b175..a965f300 100644
--- a/gui/slick/interfaces/default/inc_top.tmpl
+++ b/gui/slick/interfaces/default/inc_top.tmpl
@@ -213,7 +213,7 @@
 						<li class="dropdown">
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="$sbRoot/images/menu/system18-2.png" class="navbaricon hidden-xs" /><b class="caret hidden-xs"></b><span class="visible-xs">System <b class="caret"></b></span></a>
 							<ul class="dropdown-menu">
-								<li><a href="$sbRoot/manage/manageSearches/forceVersionCheck"><i class="menu-icon-update"></i>&nbsp;Force Version Check</a></li>
+								<li><a href="$sbRoot/home/forceVersionCheck"><i class="menu-icon-update"></i>&nbsp;Force Version Check</a></li>
                                 <li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm restart"><i class="menu-icon-restart"></i>&nbsp;Restart</a></li>
                                 <li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm shutdown"><i class="menu-icon-shutdown"></i>&nbsp;Shutdown</a></li>
                                 <li><a href="$sbRoot/logout" class="confirm logout"><i class="menu-icon-shutdown"></i>&nbsp;Logout</a></li>
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index fd8f4169..ab1908d6 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -108,12 +108,14 @@ AUTO_UPDATE = False
 NOTIFY_ON_UPDATE = False
 CUR_COMMIT_HASH = None
 BRANCH = ''
+
+GIT_RESET = False
 GIT_REMOTE = ''
 GIT_REMOTE_URL = ''
 CUR_COMMIT_BRANCH = ''
-
 GIT_ORG = 'SiCKRAGETV'
 GIT_REPO = 'SickRage'
+GIT_PATH = None
 
 INIT_LOCK = Lock()
 started = False
@@ -460,8 +462,6 @@ DELETE_FAILED = False
 
 EXTRA_SCRIPTS = []
 
-GIT_PATH = None
-
 IGNORE_WORDS = "german,french,core2hd,dutch,swedish,reenc,MrLss"
 REQUIRE_WORDS = ""
 
@@ -481,7 +481,7 @@ def get_backlog_cycle_time():
 def initialize(consoleLogging=True):
     with INIT_LOCK:
 
-        global BRANCH, GIT_REMOTE, GIT_REMOTE_URL, 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, API_ROOT, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
+        global BRANCH, GIT_RESET, GIT_REMOTE, GIT_REMOTE_URL, 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, API_ROOT, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
             HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, RANDOMIZE_PROVIDERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \
             SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_CATEGORY_ANIME, SAB_HOST, \
             NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_CATEGORY_ANIME, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \
@@ -555,6 +555,10 @@ def initialize(consoleLogging=True):
         except:
             gh = None
 
+        # git reset on update
+        GIT_RESET = bool(check_setting_int(CFG, 'General', 'git_reset', 0))
+
+        # current git branch
         BRANCH = check_setting_str(CFG, 'General', 'branch', '')
 
         # git_remote
@@ -1397,6 +1401,7 @@ def save_config():
 
     # For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config()
     new_config['General'] = {}
+    new_config['General']['git_reset'] = int(GIT_RESET)
     new_config['General']['branch'] = BRANCH
     new_config['General']['git_remote'] = GIT_REMOTE
     new_config['General']['git_remote_url'] = GIT_REMOTE_URL
diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py
index c1506f01..74feb4e5 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/versionChecker.py
@@ -569,11 +569,11 @@ class GitUpdateManager(UpdateManager):
         Calls git reset --hard to perform a hard reset. Returns a bool depending
         on the call's success.
         """
+        if sickbeard.GIT_RESET:
+            output, err, exit_status = self._run_git(self._git_path, 'reset --hard')  # @UnusedVariable
 
-        output, err, exit_status = self._run_git(self._git_path, 'reset --hard')  # @UnusedVariable
-
-        if exit_status == 0:
-            return True
+            if exit_status == 0:
+                return True
 
         return False