From a48babfa09db4b1dd9cd39c6e0000c29c5972ddc Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Tue, 1 Apr 2014 13:56:45 -0700
Subject: [PATCH] Easily track develop branch if.... on the develop branch

---
 data/interfaces/default/base.html |  3 +++
 headphones/__init__.py            |  9 ++++++---
 headphones/versioncheck.py        | 18 ++++++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index e7d26f1a..a82267fe 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -89,6 +89,9 @@
 				%if version.HEADPHONES_VERSION != 'master':
 				(${version.HEADPHONES_VERSION})
 				%endif
+				%if headphones.GIT_BRANCH != 'master':
+				(${headphones.GIT_BRANCH})
+				%endif
 			</div>
 		</footer>
 		<a href="#main" id="toTop"><i class="fa fa-angle-double-up"></i> <span>Back to top</span></a>
diff --git a/headphones/__init__.py b/headphones/__init__.py
index fbf0dddf..b0bec3d6 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -82,7 +82,8 @@ API_KEY = None
 
 GIT_PATH = None
 GIT_USER = None
-GIT_BRANCH =None
+GIT_BRANCH = None
+DO_NOT_OVERRIDE_GIT_BRANCH = False
 INSTALL_TYPE = None
 CURRENT_VERSION = None
 LATEST_VERSION = None
@@ -331,7 +332,7 @@ def initialize():
     with INIT_LOCK:
 
         global __INITIALIZED__, FULL_PATH, PROG_DIR, VERBOSE, DAEMON, SYS_PLATFORM, DATA_DIR, CONFIG_FILE, CFG, CONFIG_VERSION, LOG_DIR, CACHE_DIR, \
-                HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, HTTP_PROXY, LAUNCH_BROWSER, API_ENABLED, API_KEY, GIT_PATH, GIT_USER, GIT_BRANCH, \
+                HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, HTTP_PROXY, LAUNCH_BROWSER, API_ENABLED, API_KEY, GIT_PATH, GIT_USER, GIT_BRANCH, DO_NOT_OVERRIDE_GIT_BRANCH, \
                 CURRENT_VERSION, LATEST_VERSION, CHECK_GITHUB, CHECK_GITHUB_ON_STARTUP, CHECK_GITHUB_INTERVAL, MUSIC_DIR, DESTINATION_DIR, \
                 LOSSLESS_DESTINATION_DIR, PREFERRED_QUALITY, PREFERRED_BITRATE, DETECT_BITRATE, ADD_ARTISTS, CORRECT_METADATA, MOVE_FILES, \
                 RENAME_FILES, FOLDER_FORMAT, FILE_FORMAT, FILE_UNDERSCORES, CLEANUP_FILES, INCLUDE_EXTRAS, EXTRAS, AUTOWANT_UPCOMING, AUTOWANT_ALL, KEEP_TORRENT_FILES, \
@@ -410,6 +411,7 @@ def initialize():
         GIT_PATH = check_setting_str(CFG, 'General', 'git_path', '')
         GIT_USER = check_setting_str(CFG, 'General', 'git_user', 'rembo10')
         GIT_BRANCH = check_setting_str(CFG, 'General', 'git_branch', 'master')
+        DO_NOT_OVERRIDE_GIT_BRANCH = check_setting_int(CFG, 'General', 'do_not_override_git_branch', 0)
         LOG_DIR = check_setting_str(CFG, 'General', 'log_dir', '')
         CACHE_DIR = check_setting_str(CFG, 'General', 'cache_dir', '')
 
@@ -712,7 +714,7 @@ def initialize():
 
         # Get the currently installed version - returns None, 'win32' or the git hash
         # Also sets INSTALL_TYPE variable to 'win', 'git' or 'source'
-        CURRENT_VERSION = versioncheck.getVersion()
+        CURRENT_VERSION, GIT_BRANCH = versioncheck.getVersion()
 
         # Check for new versions
         if CHECK_GITHUB_ON_STARTUP:
@@ -818,6 +820,7 @@ def config_write():
     new_config['General']['git_path'] = GIT_PATH
     new_config['General']['git_user'] = GIT_USER
     new_config['General']['git_branch'] = GIT_BRANCH
+    new_config['General']['do_not_override_git_branch'] = int(DO_NOT_OVERRIDE_GIT_BRANCH)
 
     new_config['General']['check_github'] = int(CHECK_GITHUB)
     new_config['General']['check_github_on_startup'] = int(CHECK_GITHUB_ON_STARTUP)
diff --git a/headphones/versioncheck.py b/headphones/versioncheck.py
index fe70eef5..dfb07c72 100644
--- a/headphones/versioncheck.py
+++ b/headphones/versioncheck.py
@@ -82,7 +82,21 @@ def getVersion():
             logger.error('Output doesn\'t look like a hash, not using it')
             return None
 
-        return cur_commit_hash
+        if headphones.DO_NOT_OVERRIDE_GIT_BRANCH and headphones.GIT_BRANCH:
+            branch_name = headphones.GIT_BRANCH
+
+        else:
+            branch_name, err = runGit('rev-parse --abbrev-ref HEAD')
+            branch_name = branch_name.strip()
+
+            if not branch_name and headphones.GIT_BRANCH:
+                logger.error('Could not retrieve branch name from git. Falling back to %s' % headphones.GIT_BRANCH)
+                branch_name = headphones.GIT_BRANCH
+            if not branch_name:
+                logger.error('Could not retrieve branch name from git. Defaulting to master')
+                branch_name = 'master'
+
+        return cur_commit_hash, branch_name
 
     else:
 
@@ -153,7 +167,7 @@ def update():
 
     elif headphones.INSTALL_TYPE == 'git':
 
-        output, err = runGit('pull origin ' + version.HEADPHONES_VERSION)
+        output, err = runGit('pull origin ' + headphones.GIT_BRANCH)
 
         if not output:
             logger.error('Couldn\'t download latest version')