From d9f393602d4d265309f35ecf6ac1f6e296f39846 Mon Sep 17 00:00:00 2001 From: Gustavo Hoirisch Date: Sat, 18 Jun 2011 20:11:20 -0700 Subject: [PATCH 1/3] Change some of the config html --- config.py | 303 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 230 insertions(+), 73 deletions(-) diff --git a/config.py b/config.py index 099ddea7..16636a72 100644 --- a/config.py +++ b/config.py @@ -44,76 +44,233 @@ def var_to_chk(variable): else: return '' -form = '''
-
-

Web Interface

- - - - -

HTTP Host:

-
-

i.e. localhost or 0.0.0.0

HTTP Username:

-

HTTP Port:

-

HTTP Password:

-

Launch Browser on Startup:

- Enabled
-

Download Settings

- - - - - - -

SABnzbd Host:

-
-

usually localhost:8080

SABnzbd Username:

-

SABnzbd API:

-

SABnzbd Password:

-

SABnzbd Category:

-

Music Download Directory:

-
-

Absolute or relative path to the dir where SAB downloads your music
- i.e. Downloads/music or /Users/name/Downloads/music


Usenet Retention:

-
-

Search Providers

- - - - - - - - -

Enable NZBMatrix:

- Enabled

NZBMatrix Username:

-

NZBMatrix API:

-


Enable Newznab:

- Enabled


Newznab Host:

-
-

i.e. http://nzb.su



Newznab API:

-


Enable NZBs.org:

- Enabled


NZBs.org UID:

-


NZBs.org Hash:

-
-

Quality & Post Processing

- - - - -

Album Quality:

- Include lossless - Convert lossless to mp3

iTunes:

- Move downloads to iTunes

Path to iTunes folder:

-
-

i.e. Music/iTunes or /Users/name/Music/iTunes

Renaming & Metadata:

- Rename & add metadata

- Delete leftover files

Album Art:

- Add album art
-


- (For now, all changes require a restart to take effect)

''' % (http_host, http_username, - http_port, http_password, var_to_chk(launch_browser), sab_host, sab_username, sab_apikey, sab_password, - sab_category, music_download_dir, usenet_retention, var_to_chk(nzbmatrix), nzbmatrix_username, nzbmatrix_apikey, - var_to_chk(newznab), newznab_host, newznab_apikey, var_to_chk(nzbsorg), nzbsorg_uid, nzbsorg_hash, - var_to_chk(include_lossless), var_to_chk(flac_to_mp3), var_to_chk(move_to_itunes), path_to_itunes, var_to_chk(rename_mp3s), - var_to_chk(cleanup), var_to_chk(add_album_art)) \ No newline at end of file +form = ''' +
+
+
+

Web Interface

+ + + + + + + + + + + + + + + + +
+

+ HTTP Host:

+
+ i.e. localhost or 0.0.0.0 +

+ 		+

+ HTTP Username:

+ +

+
+

+ HTTP Port:

+ +

+ 		+

+ HTTP Password:

+ +

+
+

Launch Browser on Startup:

+
+ +

Download Settings

+ + + + + + + + + + + + + + + + + + + + + + + +
+

SABnzbd Host:


+ + usually localhost:8080 + 		+

SABnzbd Username:

+
+
+ +

SABnzbd API:

+ 		+
+ +

SABnzbd Password:

+
+
+ +

SABnzbd Category:

+ 		+
+ +

Music Download Directory:


+ + Absolute or relative path to the dir where SAB downloads your music
+ i.e. Downloads/music or /Users/name/Downloads/music +
+
+ +

Usenet Retention:

+
+ +

Search Providers

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+

NZBMatrix:

+ 		+

+ NZBMatrix Username:
+ +

+ 		+

+ NZBMatrix API:
+ +

+
+
+ +

Newznab:

+ 		+
+ +

+ Newznab Host:
+
+ i.e. http://nzb.su +

+ 		+
+ +

+ Newznab API:
+ +

+
+
+ +

NZBs.org:

+ 		+
+ +

+ NZBs.org UID:
+ +

+ 		+
+ +

+ NZBs.org Hash:
+ +

+
+ +

Quality & Post Processing

+ + + + + + + + + + + + + + + + +
+

Album Quality:

+ Include lossless
+ Convert lossless to mp3 + 		+

+

iTunes:

+ Move downloads to iTunes +

+
+
+ +

Path to iTunes folder:
+
+ i.e. Music/iTunes or /Users/name/Music/iTunes +

+ 		+ Renaming & Metadata: +

+ Rename & add metadata +
+ Delete leftover files +

+
+
+

Album Art:

+ Add album art +
+ +


+ (For now, all changes require a restart to take effect)

+
+
+
''' % (http_host, http_username, http_port, http_password, var_to_chk(launch_browser), sab_host, sab_username, sab_apikey, sab_password, sab_category, music_download_dir, usenet_retention, var_to_chk(nzbmatrix), nzbmatrix_username, nzbmatrix_apikey, var_to_chk(newznab), newznab_host, newznab_apikey, var_to_chk(nzbsorg), nzbsorg_uid, nzbsorg_hash, var_to_chk(include_lossless), var_to_chk(flac_to_mp3), var_to_chk(move_to_itunes), path_to_itunes, var_to_chk(rename_mp3s), var_to_chk(cleanup), var_to_chk(add_album_art)) + From 7eb30a3a7a439b95fa3c610749ed74edf71f5f03 Mon Sep 17 00:00:00 2001 From: Gustavo Hoirisch Date: Sun, 19 Jun 2011 06:22:23 -0700 Subject: [PATCH 2/3] Added links to sections of config page. --- config.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index 16636a72..14bada73 100644 --- a/config.py +++ b/config.py @@ -46,9 +46,17 @@ def var_to_chk(variable): form = '''
+
+
+ Web Interface | + Download Settings | + Search Providers | + Quality & Post Processing +
+
-

Web Interface

+

Web Interface

 @@ -90,7 +98,7 @@ form = '''
-

Download Settings

+

Download Settings

 @@ -145,7 +153,7 @@ form = '''
-

Search Providers

+

Search Providers

 @@ -222,7 +230,7 @@ form = '''
-

Quality & Post Processing

+

Quality & Post Processing

 From 65e9004c94db010d82e99c929d6790f8f42854f3 Mon Sep 17 00:00:00 2001 From: Gustavo Hoirisch Date: Sun, 19 Jun 2011 06:29:23 -0700 Subject: [PATCH 3/3] Changed section links to be submenu like links. --- config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.py b/config.py index 14bada73..ae559ec8 100644 --- a/config.py +++ b/config.py @@ -45,7 +45,7 @@ def var_to_chk(variable): return '' form = ''' -
+
Web Interface | @@ -54,6 +54,7 @@ form = ''' Quality & Post Processing
+

Web Interface