From 26a5be9e6176c5c04aa0c8037b45b2b4a31eebad Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Sun, 12 Aug 2012 19:46:01 +0530
Subject: [PATCH] Make proxy tools optional (disabled by default

---
 Headphones.py          | 1 +
 headphones/__init__.py | 5 ++++-
 headphones/webstart.py | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Headphones.py b/Headphones.py
index b6591d75..999c8d1f 100644
--- a/Headphones.py
+++ b/Headphones.py
@@ -122,6 +122,7 @@ def main():
                     'http_port':        http_port,
                     'http_host':        headphones.HTTP_HOST,
                     'http_root':        headphones.HTTP_ROOT,
+                    'http_proxy':       headphones.HTTP_PROXY,
                     'http_username':    headphones.HTTP_USERNAME,
                     'http_password':    headphones.HTTP_PASSWORD,
             })
diff --git a/headphones/__init__.py b/headphones/__init__.py
index 265a016e..f0750696 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -66,6 +66,7 @@ HTTP_HOST = None
 HTTP_USERNAME = None
 HTTP_PASSWORD = None
 HTTP_ROOT = None
+HTTP_PROXY = False
 LAUNCH_BROWSER = False
 
 API_ENABLED = False
@@ -236,7 +237,7 @@ def initialize():
     with INIT_LOCK:
     
         global __INITIALIZED__, FULL_PATH, PROG_DIR, VERBOSE, DAEMON, DATA_DIR, CONFIG_FILE, CFG, CONFIG_VERSION, LOG_DIR, CACHE_DIR, \
-                HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, LAUNCH_BROWSER, API_ENABLED, API_KEY, GIT_PATH, \
+                HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, HTTP_PROXY, LAUNCH_BROWSER, API_ENABLED, API_KEY, GIT_PATH, \
                 CURRENT_VERSION, LATEST_VERSION, CHECK_GITHUB, CHECK_GITHUB_ON_STARTUP, CHECK_GITHUB_INTERVAL, MUSIC_DIR, DESTINATION_DIR, PREFERRED_QUALITY, PREFERRED_BITRATE, DETECT_BITRATE, \
                 ADD_ARTISTS, CORRECT_METADATA, MOVE_FILES, RENAME_FILES, FOLDER_FORMAT, FILE_FORMAT, CLEANUP_FILES, INCLUDE_EXTRAS, AUTOWANT_UPCOMING, AUTOWANT_ALL, \
                 ADD_ALBUM_ART, EMBED_ALBUM_ART, EMBED_LYRICS, DOWNLOAD_DIR, BLACKHOLE, BLACKHOLE_DIR, USENET_RETENTION, SEARCH_INTERVAL, \
@@ -281,6 +282,7 @@ def initialize():
         HTTP_USERNAME = check_setting_str(CFG, 'General', 'http_username', '')
         HTTP_PASSWORD = check_setting_str(CFG, 'General', 'http_password', '')
         HTTP_ROOT = check_setting_str(CFG, 'General', 'http_root', '/')
+        HTTP_PROXY = bool(check_setting_int(CFG, 'General', 'http_proxy', 0))
         LAUNCH_BROWSER = bool(check_setting_int(CFG, 'General', 'launch_browser', 1))
         API_ENABLED = bool(check_setting_int(CFG, 'General', 'api_enabled', 0))
         API_KEY = check_setting_str(CFG, 'General', 'api_key', '')
@@ -555,6 +557,7 @@ def config_write():
     new_config['General']['http_username'] = HTTP_USERNAME
     new_config['General']['http_password'] = HTTP_PASSWORD
     new_config['General']['http_root'] = HTTP_ROOT
+    new_config['General']['http_proxy'] = int(HTTP_PROXY)
     new_config['General']['launch_browser'] = int(LAUNCH_BROWSER)
     new_config['General']['api_enabled'] = int(API_ENABLED)
     new_config['General']['api_key'] = API_KEY
diff --git a/headphones/webstart.py b/headphones/webstart.py
index 13465bff..b16d6765 100644
--- a/headphones/webstart.py
+++ b/headphones/webstart.py
@@ -36,7 +36,7 @@ def initialize(options={}):
     conf = {
         '/': {
             'tools.staticdir.root': os.path.join(headphones.PROG_DIR, 'data'),
-            'tools.proxy.on': True,  # pay attention to X-Forwarded-Proto header
+            'tools.proxy.on': options['http_proxy']  # pay attention to X-Forwarded-Proto header
         },
         '/interfaces':{
             'tools.staticdir.on': True,