From 109d5f996f22fd74d52f3622b3a693c19b4e6cbc Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Wed, 10 Jul 2013 09:03:56 +0530
Subject: [PATCH] Added Transmission & uTorrent options to config page

---
 data/interfaces/default/config.html | 38 ++++++++++++++++++++---------
 headphones/webserve.py              | 20 ++++++++++++---
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 3b8df313..9386cf59 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -162,7 +162,7 @@
 	                   	  </div>
 	                </fieldset>
                     
-                    <fieldset id="general_nzb_options2">
+                    <fieldset id="general_nzb_options">
                        	<div class="row">
                             <label>Music Download Directory:</label>
                             <input type="text" name="download_dir" value="${config['download_dir']}" size="50">
@@ -187,18 +187,34 @@
 							</div>
 						</fieldset>
 						<fieldset id="transmission_options">
-							<div class="row">               
-								<label>Transmission Host</label>
-								<input type="text" name="" value="" size="50">
-								<small>Transmission Host</small>
-							</div>
+		                	<div class="row">
+			                    <label>Transmission Host:</label>
+			                    <input type="text" name="transmission_host" value="${config['transmission_host']}" size="30">
+			                    <small>usually http://localhost:9091</small>
+		                    </div>
+		                    <div class="row">
+			                    <label>Transmission Username:</label>
+			                    <input type="text" name="transmission_username" value="${config['transmission_user']}" size="30">
+		                    </div>
+		                    <div class="row">
+			                    <label>Transmission Password:</label>
+			                    <input type="text" name="transmission_password" value="${config['transmission_pass']}" size="30">
+		                    </div>
 						</fieldset>
 						<fieldset id="utorrent_options">
-							<div class="row">               
-								<label>Utorrent Host</label>
-								<input type="text" name="" value="" size="50">
-								<small>Utorrent Host</small>
-							</div>
+		                	<div class="row">
+			                    <label>uTorrent Host:</label>
+			                    <input type="text" name="utorrent_host" value="${config['utorrent_host']}" size="30">
+			                    <small>usually http://localhost:9091</small>
+		                    </div>
+		                    <div class="row">
+			                    <label>uTorrent Username:</label>
+			                    <input type="text" name="utorrent_username" value="${config['utorrent_user']}" size="30">
+		                    </div>
+		                    <div class="row">
+			                    <label>uTorrent Password:</label>
+			                    <input type="text" name="utorrent_password" value="${config['utorrent_pass']}" size="30">
+		                    </div>
 						</fieldset>
 						<fieldset id="general_torrent_options">
 							<div class="row">
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 082c73bd..0b5e395b 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -579,6 +579,12 @@ class WebInterface(object):
                     "nzbget_user" : headphones.NZBGET_USERNAME,
                     "nzbget_pass" : headphones.NZBGET_PASSWORD,
                     "nzbget_cat" : headphones.NZBGET_CATEGORY,
+                    "transmission_host" : headphones.TRANSMISSION_HOST,
+                    "transmission_user" : headphones.TRANSMISSION_USERNAME,
+                    "transmission_pass" : headphones.TRANSMISSION_PASSWORD,
+                    "utorrent_host" : headphones.UTORRENT_HOST,
+                    "utorrent_user" : headphones.UTORRENT_USERNAME,
+                    "utorrent_pass" : headphones.UTORRENT_PASSWORD,
                     "nzb_downloader_sabnzbd" : radio(headphones.NZB_DOWNLOADER, 0),
                     "nzb_downloader_nzbget" : radio(headphones.NZB_DOWNLOADER, 1),
                     "nzb_downloader_blackhole" : radio(headphones.NZB_DOWNLOADER, 2),
@@ -708,10 +714,10 @@ class WebInterface(object):
 
     def configUpdate(self, http_host='0.0.0.0', http_username=None, http_port=8181, http_password=None, launch_browser=0, api_enabled=0, api_key=None, 
         download_scan_interval=None, nzb_search_interval=None, libraryscan_interval=None, sab_host=None, sab_username=None, sab_apikey=None, sab_password=None, 
-        sab_category=None, nzbget_host=None, nzbget_username='nzbget', nzbget_password=None, nzbget_category=None, nzb_downloader=0, torrent_downloader=0,
-        download_dir=None, blackhole=0, blackhole_dir=None, usenet_retention=None, newznab=0, newznab_host=None, newznab_apikey=None, 
-        newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, nzbsrus=0, nzbsrus_uid=None, nzbsrus_apikey=None, nzbx=0, preferred_words=None, required_words=None, ignored_words=None,
-        preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, 
+        sab_category=None, nzbget_host=None, nzbget_username=None, nzbget_password=None, nzbget_category=None, transmission_host=None, transmission_username=None, transmission_password=None, 
+        utorrent_host=None, utorrent_username=None, utorrent_password=None, nzb_downloader=0, torrent_downloader=0, download_dir=None, blackhole=0, blackhole_dir=None, 
+        usenet_retention=None, newznab=0, newznab_host=None, newznab_apikey=None, newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, nzbsrus=0, nzbsrus_uid=None, 
+        nzbsrus_apikey=None, nzbx=0, preferred_words=None, required_words=None, ignored_words=None, preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, 
         numberofseeders=10, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_username=None, whatcd_password=None,
         rutracker=0, rutracker_user=None, rutracker_password=None, rename_files=0, correct_metadata=0, cleanup_files=0, add_album_art=0, album_art_format=None, embed_album_art=0, embed_lyrics=0, 
         destination_dir=None, lossless_destination_dir=None, folder_format=None, file_format=None, include_extras=0, single=0, ep=0, compilation=0, soundtrack=0, live=0,
@@ -741,6 +747,12 @@ class WebInterface(object):
         headphones.NZBGET_USERNAME = nzbget_username
         headphones.NZBGET_PASSWORD = nzbget_password
         headphones.NZBGET_CATEGORY = nzbget_category
+        headphones.TRANSMISSION_HOST = transmission_host
+        headphones.TRANSMISSION_USERNAME = transmission_username
+        headphones.TRANSMISSION_PASSWORD = transmission_password
+        headphones.UTORRENT_HOST = utorrent_host
+        headphones.UTORRENT_USERNAME = utorrent_username
+        headphones.UTORRENT_PASSWORD = utorrent_password
         headphones.NZB_DOWNLOADER = int(nzb_downloader)
         headphones.TORRENT_DOWNLOADER = int(torrent_downloader)
         headphones.DOWNLOAD_DIR = download_dir