From b869f4a0176adb885ed59cb5bae7eff274e701bd Mon Sep 17 00:00:00 2001
From: Remy <remyvarma@gmail.com>
Date: Fri, 19 Aug 2011 13:51:57 -0700
Subject: [PATCH] Cleaned up some config stuff, changed version back to master,
 added try/except clause to github check

---
 data/interfaces/default/config.html | 76 ++++++++---------------------
 headphones/__init__.py              |  5 +-
 headphones/version.py               |  2 +-
 3 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 0d46458e..31d0f4b4 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -260,7 +260,7 @@
                 <td>
                       <h2>Re-Encoding Options:</h2>
 						<br>
-                      	<h3><input type="checkbox" name="encode" value="1" ${config['encode']}/>Re-encode Postprocessed Albuns</h3>
+                      	<h3><input type="checkbox" name="encode" value="1" ${config['encode']}/> Re-encode downloads during postprocessing</h3>
                       <i class="smalltext">Note: this option requires the lame or ffmpeg encoder</i>
 					<br><br>
 					<%
@@ -275,66 +275,30 @@
 						<option value="lame" ${lameselect}>lame</option>
 						<option value="ffmpeg" ${ffmpegselect}>ffmpeg</option>
 					</select>
-					
-					<%
-						if config['encoderoutputformat'] == 'ogg':
-							oggselect = 'selected="selected"'
-							mp3select = ''
-							m4aselect = ''
-						elif config['encoderoutputformat'] == 'm4a':
-							oggselect = ''
-							m4aselect = 'selected="selected"'
-							mp3select = ''
-						else:
-							oggselect = ''
-							m4aselect = ''
-							mp3select = 'selected="selected"'						
-					%>
+
 					Format: <select name="encoderoutputformat">
-						<option value="mp3" ${mp3select}>mp3</option>
-						<option value="ogg" ${oggselect}>ogg</option>
-						<option value="m4a" ${m4aselect}>m4a</option>
+					%for x in ['mp3', 'ogg', 'm4a']:
+						<%
+							if config['encoderoutputformat'] == x:
+								outputselect = 'selected'
+							else:
+								outputselect = ''
+						%>
+						<option value=${x} ${outputselect}>${x}</option>
+					%endfor
 					</select></h4>
 
 					<br>
-					<%
-						if config["bitrate"] == 64:
-							bitrate64select = 'selected="selected"'
-							bitrate128select = ''
-							bitrate192select = ''
-							bitrate256select = ''
-							bitrate320select = ''
-						elif config["bitrate"] == 128:
-							bitrate64select = ''
-							bitrate128select = 'selected="selected"'
-							bitrate192select = ''
-							bitrate256select = ''
-							bitrate320select = ''
-						elif config["bitrate"] == 192:
-							bitrate64select = ''
-							bitrate128select = ''
-							bitrate192select = 'selected="selected"'
-							bitrate256select = ''
-							bitrate320select = ''
-						elif config["bitrate"] == 256:
-							bitrate64select = ''
-							bitrate128select = ''
-							bitrate192select = ''
-							bitrate256select = 'selected="selected"'
-							bitrate320select = ''
-						else:
-							bitrate64select = ''
-							bitrate128select = ''
-							bitrate192select = ''
-							bitrate256select = ''
-							bitrate320select = 'selected="selected"'							
-					%>
 					<h4>Bitrate: <select name="bitrate">
-						<option value=64 ${bitrate64select}> 64 kbps</option>
-						<option value=128 ${bitrate128select}>128 kbps</option>
-						<option value=192 ${bitrate192select}>192 kbps</option>
-						<option value=256 ${bitrate256select}>256 kbps</option>
-						<option value=320 ${bitrate320select}>320 kbps</option>
+					%for x in [64, 128, 192, 256, 320]:
+						<%
+							if config["bitrate"] == x:
+								bitrateselected = "selected"
+							else:
+								bitrateselected = ''
+						%>	
+						<option value=${x} ${bitrateselected}> ${x} kbps</option>
+					%endfor
 					</select>
 					
 					<%
diff --git a/headphones/__init__.py b/headphones/__init__.py
index e46f8c0e..30b6917f 100755
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -308,7 +308,10 @@ def initialize():
         CURRENT_VERSION = versioncheck.getVersion()
         
         # Check for new versions
-        LATEST_VERSION = versioncheck.checkGithub()
+        try:
+            LATEST_VERSION = versioncheck.checkGithub()
+        except:
+            LATEST_VERSION = CURRENT_VERSION
 
         __INITIALIZED__ = True
         return True
diff --git a/headphones/version.py b/headphones/version.py
index b6c5af53..0dda129e 100644
--- a/headphones/version.py
+++ b/headphones/version.py
@@ -1 +1 @@
-HEADPHONES_VERSION = "develop"
\ No newline at end of file
+HEADPHONES_VERSION = "master"
\ No newline at end of file