From cffc39e5a04d5c52390aaba02af54a8b6280f726 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Tue, 15 Apr 2014 16:35:36 -0700
Subject: [PATCH] This should once and for all correct issue #328

---
 nzbtomedia/__init__.py     | 30 ++++++++++++++++--------------
 nzbtomedia/versionCheck.py | 12 +++---------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py
index c48e2021..00d29c6f 100644
--- a/nzbtomedia/__init__.py
+++ b/nzbtomedia/__init__.py
@@ -45,8 +45,7 @@ SYS_ARGV = None
 
 # version constants
 AUTO_UPDATE = None
-NZBTOMEDIA_VERSION = '9.3'
-NZBTOMEDIA_BRANCH = None
+NZBTOMEDIA_VERSION = None
 NEWEST_VERSION = None
 NEWEST_VERSION_STRING = None
 VERSION_NOTIFY = None
@@ -54,6 +53,7 @@ VERSION_NOTIFY = None
 GIT_PATH = None
 GIT_USER = None
 GIT_BRANCH = None
+GIT_REPO = None
 
 CLIENTAGENT = None
 USELINK = None
@@ -98,16 +98,16 @@ USER_SCRIPT_RUNONCE = None
 __INITIALIZED__ = False
 
 def initialize():
-    global NZBGET_POSTPROCESS_ERROR, NZBGET_POSTPROCESS_NONE, NZBGET_POSTPROCESS_PARCHECK, NZBGET_POSTPROCESS_SUCCESS, \
-        NZBTOMEDIA_TIMEOUT, FORKS, FORK_DEFAULT, FORK_FAILED_TORRENT, FORK_FAILED, SICKBEARD_TORRENT, SICKBEARD_FAILED, \
-        PROGRAM_DIR, CFG, CFG_LOGGING, CONFIG_FILE, CONFIG_MOVIE_FILE, CONFIG_SPEC_FILE, LOG_DIR, NZBTOMEDIA_BRANCH, \
-        CONFIG_TV_FILE, LOG_FILE, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, VERSION_NOTIFY, SYS_ARGV, \
-        SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, CLIENTAGENT, USELINK, OUTPUTDIRECTORY, NOFLATTEN, \
-        UTORRENTPWD, UTORRENTUSR, UTORRENTWEBUI, DELUGEHOST, DELUGEPORT, DELUGEUSR, DELUGEPWD, TRANSMISSIONHOST, TRANSMISSIONPORT, \
+    global NZBGET_POSTPROCESS_ERROR, NZBGET_POSTPROCESS_NONE, NZBGET_POSTPROCESS_PARCHECK, NZBGET_POSTPROCESS_SUCCESS,\
+        NZBTOMEDIA_TIMEOUT, FORKS, FORK_DEFAULT, FORK_FAILED_TORRENT, FORK_FAILED, SICKBEARD_TORRENT, SICKBEARD_FAILED,\
+        PROGRAM_DIR, CFG, CFG_LOGGING, CONFIG_FILE, CONFIG_MOVIE_FILE, CONFIG_SPEC_FILE, LOG_DIR, NZBTOMEDIA_BRANCH,\
+        CONFIG_TV_FILE, LOG_FILE, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, VERSION_NOTIFY, SYS_ARGV,\
+        SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, CLIENTAGENT, USELINK, OUTPUTDIRECTORY, NOFLATTEN,\
+        UTORRENTPWD, UTORRENTUSR, UTORRENTWEBUI, DELUGEHOST, DELUGEPORT, DELUGEUSR, DELUGEPWD, TRANSMISSIONHOST, TRANSMISSIONPORT,\
         TRANSMISSIONPWD, TRANSMISSIONUSR, COMPRESSEDCONTAINER, MEDIACONTAINER, METACONTAINER, MINSAMPLESIZE, SAMPLEIDS, \
-        SECTIONS, SUBSECTIONS, USER_SCRIPT_CATEGORIES, __INITIALIZED__, GIT_PATH, GIT_USER, GIT_BRANCH, AUTO_UPDATE, APP_FILENAME, \
+        SECTIONS, SUBSECTIONS, USER_SCRIPT_CATEGORIES, __INITIALIZED__, AUTO_UPDATE, APP_FILENAME, USER_DELAY, USER_SCRIPT_RUNONCE,\
         APP_NAME,USER_SCRIPT_MEDIAEXTENSIONS, USER_SCRIPT, USER_SCRIPT_PARAM, USER_SCRIPT_SUCCESSCODES, USER_SCRIPT_CLEAN,\
-        USER_DELAY, USER_SCRIPT_RUNONCE, TRANSCODE
+        TRANSCODE, GIT_PATH, GIT_USER, GIT_BRANCH, GIT_REPO
 
 
     if __INITIALIZED__:
@@ -176,8 +176,9 @@ def initialize():
     VERSION_NOTIFY = int(CFG['General']['version_notify'])
     AUTO_UPDATE = int(CFG['General']['auto_update'])
     GIT_PATH = CFG['General']['git_path']
-    GIT_USER = CFG['General']['git_user']
-    GIT_BRANCH = CFG['General']['git_branch']
+    GIT_USER = CFG['General']['git_user'] or 'clinton-hall'
+    GIT_BRANCH = CFG['General']['git_branch'] or 'dev'
+    GIT_REPO = 'nzbToMedia'
 
     # Check for updates via GitHUB
     if versionCheck.CheckVersion().check_for_new_version():
@@ -190,8 +191,9 @@ def initialize():
             else:
                 logger.error("Update wasn't successful, not restarting. Check your log for more information.")
 
-    # Display Current Version
-    logger.info('nzbToMedia Version:' + NZBTOMEDIA_VERSION + ' Branch:' + NZBTOMEDIA_BRANCH + ' (' + str(platform.system()) + '-' + str(platform.release()) + ')')
+    # Set Current Version
+    NZBTOMEDIA_VERSION = '9.3'
+    logger.info('nzbToMedia Version:' + NZBTOMEDIA_VERSION + ' Branch:' + GIT_BRANCH + ' (' + platform.system() + ' ' + platform.release() + ')')
 
     WakeUp()
 
diff --git a/nzbtomedia/versionCheck.py b/nzbtomedia/versionCheck.py
index 65e8da7c..8b03ead2 100644
--- a/nzbtomedia/versionCheck.py
+++ b/nzbtomedia/versionCheck.py
@@ -81,19 +81,13 @@ class CheckVersion():
 
 class UpdateManager():
     def get_github_repo_user(self):
-        repo_user = 'clinton-hall'
-        if nzbtomedia.GIT_USER:
-            repo_user = nzbtomedia.GIT_USER
-        return repo_user
+        return nzbtomedia.GIT_USER
 
     def get_github_repo(self):
-        return 'nzbToMedia'
+        return nzbtomedia.GIT_REPO
 
     def get_github_branch(self):
-        git_branch = 'dev'
-        if nzbtomedia.GIT_BRANCH:
-            git_branch = nzbtomedia.GIT_BRANCH
-        return git_branch
+        return nzbtomedia.GIT_BRANCH
 
 class GitUpdateManager(UpdateManager):
     def __init__(self):