diff --git a/data/css/style.css b/data/css/style.css index 50614f91..b139cddc 100755 --- a/data/css/style.css +++ b/data/css/style.css @@ -111,6 +111,8 @@ h2 { font-size: 20px; } h3 { font-size: 16px; } p.indented { padding-top: 20px; margin-left: 20px; font-size: 14px; } +p.center { text-align: center; font-size: 18px; } +.smalltext2 { font-size: 11px; margin-left: 45px; } div#updatebar { text-align: center; min-width: 970px; width: 100%; background-color: light-blue; float: left; } div#logo { float: left; padding-left: 10px; } @@ -120,7 +122,7 @@ ul#nav li { margin: 40px 0px auto 10px; display: inline; } ul#nav li a { padding: 5px; font-size: 16px; font-weight: bold; color: #330000; text-decoration: none; } ul#nav li a:hover { background-color: #a3e532; } -div#subhead_container { height: 30px; width:100%; min-width: 930px; background-color:#330000; float: left; list-style-type: none; z-index: 998; overflow: hidden; } +div#subhead_container { height: 30px; width:100%; min-width: 1000px; background-color:#330000; float: left; list-style-type: none; z-index: 998; overflow: hidden; } ul#subhead_menu { margin-top: 5px; } ul#subhead_menu li { width: 100%; height: 100%; display: inline; } ul#subhead_menu li a { padding: 5px 15px 10px 15px; vertical-align: middle; color: white; font-size: 16px; text-decoration: none; } @@ -132,8 +134,12 @@ div#main { margin: 0; padding: 80px 0 0 0; } .table_wrapper { border-radius: 20px; -webkit-border-radius: 20px; -moz-border-radius: 20px; width: 88%; margin: 20px auto 0 auto; padding: 25px; background-color: white; position: relative; min-height: 200px; clear: both; _height: 302px; zoom: 1; } .manage_wrapper { width: 88%; margin: 20px auto 0 auto; padding: 25px; min-height: 150px; clear: both; _height: 302px; zoom: 1; } -.table_wrapper_left { padding: 25px; background-color: #ffffff; float: left; width: 40%; height: 200px; margin-top: 25px; margin-left: 30px; margin-right: auto; -moz-border-radius: 20px; border-radius: 20px; } -.table_wrapper_right{ padding: 25px; background-color: #ffffff; width: 40%; height: 200px; margin-top: 25px; margin-left: auto; margin-right: 30px; -moz-border-radius: 20px; border-radius: 20px; } +.table_wrapper_left { padding: 25px; background-color: #ffffff; float: left; width: 40%; min-height: 100px; margin-top: 25px; margin-left: 30px; margin-right: auto; -moz-border-radius: 20px; border-radius: 20px; } +.table_wrapper_right{ padding: 25px; background-color: #ffffff; width: 40%; min-height: 100px; margin-top: 25px; margin-left: auto; margin-right: 30px; -moz-border-radius: 20px; border-radius: 20px; } + +.configtable { font-size: 14px; line-height:18px; } +.configtable td { width: 350px; padding: 10px; vertical-align: middle; } +.configtable tr { vertical-align: text-top; } table#artist_table { background-color: white; width: 100%; padding: 20px; } diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index be26c7f4..bea006a8 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -1,220 +1,247 @@ <%inherit file="base.html"/> -
-
+ +<%def name="body()">
-

Web Interface

- + +

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:


+ + Full path to the directory where SAB downloads your music
+ i.e. /Users/name/Downloads/music +
+

Use Black Hole:

+ 		+

Black Hole Directory:


+ + Folder your Download program watches for NZBs +
+

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:

+ + +
-

HTTP Host:
-
- e.g. localhost or 0.0.0.0 -

- 		-

HTTP Username:
- -

-
-

HTTP Port:
- -

- 		-

HTTP Password:
- -

-
-

Launch Browser on Startup:

-
+

Newzbin:

+ 		+

Newzbin UID:

+ + + 		+
+ +

Newzbin Password:

+ +
+
+
+

Quality & Post Processing

 + + + + + + + + + +
+

Album Quality:


+ Highest Quality excluding Lossless
+ Highest Quality including Lossless
+ Lossless Only
+ Preferred Bitrate: + kbps
+ Auto-Detect Preferred Bitrate + 		+

Post-Processing:

+ Move downloads to Destination Folder
+ Rename files
+ Correct metadata
+ Delete leftover files (.m3u, .nfo, .sfv, .nzb, etc.)
+ Add album art as 'folder.jpg' to album folder
+ Embed album art in each file +
+
+ +

Path to Destination folder:

+
+ i.e. /Users/name/Music/iTunes or /Volumes/share/music +
-

Download Settings

- - - - - - - - - - - - - - - - - - - - -
-

SABnzbd Host:

-
- e.g. localhost:8080 - 		-

SABnzbd Username:

- -
-

SABnzbd API:

- - 		-

SABnzbd Password:

- -
-

SABnzbd Category:

- 		-

Music Download Directory:

-
- Full path to the directory where SAB downloads your music
- e.g. Downloads/music or /Users/name/Downloads/music -
-

Use Black Hole:

- - 		-

Black Hole Directory:

-
- Folder your Download program watches for NZBs -
-

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: -

- Highest Quality excluding Lossless
- Highest Quality including Lossless
- Lossless Only
- Preferred Bitrate: kbps
- Auto-Detect Preferred Bitrate -

- 		- Post-Processing: -

- Move downloads to Music Folder
- Rename & add metadata
- Correct metadata
- Delete leftover files
- Add album art
- Embed album art in each file
-

-
-

- Path to Music folder:
-
- e.g. /Users/name/Music/iTunes or /Volumes/share/music -

-
-
-
- -

- Advanced Settings -

- - +

Advanced Settings

 + +
- Renaming Options: -

- Folder Format:
- -
- Use: artist, album and year, '/' for directories.
E.g.: artist/album [year] -

-

- File Format:
- -
- Use: tracknumber, title, artist, album and year -

+

Renaming Options:

+
+

Folder Format:

+ Use: artist, album, year and first (first letter in artist name)
+ E.g.: first/artist/album [year] = G/Girl Talk/All Day [2010] +

+

File Format:

+
+ Use: tracknumber, title, artist, album and year 		- Miscellaneous: -

- Automatically Include Extras When Adding an Artist
- Extras includes: EPs, Compilations, Live Albums, Remix Albums and Singles -

- Log Directory: -

- -

+

Miscellaneous:

+
+

Automatically Include Extras When Adding an Artist


+ Extras includes: EPs, Compilations, Live Albums, Remix Albums and Singles +


+

Log Directory:
-

-
- (Web Interface changes require a restart to take effect) -

- -
+ +


+ (Web Interface changes require a restart to take effect) + + <%inherit file="base.html" /> \ No newline at end of file diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html index 28d9e015..8b891317 100644 --- a/data/interfaces/default/manage.html +++ b/data/interfaces/default/manage.html @@ -49,9 +49,9 @@

Force Search


- Force Check for Wanted Albums

- Force Update Active Artists

- Force Post-Process Albums in Download Folder


- Check for Headphones Updates


+

Force Check for Wanted Albums

+

Force Update Active Artists

+

Force Post-Process Albums in Download Folder



+

Check for Headphones Updates

\ No newline at end of file diff --git a/headphones/lastfm.py b/headphones/lastfm.py index 914bd2b8..0e39a110 100644 --- a/headphones/lastfm.py +++ b/headphones/lastfm.py @@ -103,11 +103,9 @@ def getAlbumDescription(rgid, releaselist): mbid = release['releaseid'] url = 'http://ws.audioscrobbler.com/2.0/?method=album.getInfo&mbid=%s&api_key=%s' % (mbid, api_key) - logger.info('Checking last.fm for: ' + mbid) data = urllib.urlopen(url).read() - if data == 'Album not found': - logger.info('Release id not on last fm, skipping') + if data == 'Album not found': continue try: @@ -128,7 +126,6 @@ def getAlbumDescription(rgid, releaselist): 'Summary': summary, 'Content': content} myDB.upsert("descriptions", newValueDict, controlValueDict) - logger.info('Inserted description') break except: diff --git a/headphones/webserve.py b/headphones/webserve.py index cb6a98f9..d3ffc7f2 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -276,10 +276,13 @@ class WebInterface(object): "use_nzbsorg" : checked(headphones.NZBSORG), "nzbsorg_uid" : headphones.NZBSORG_UID, "nzbsorg_hash" : headphones.NZBSORG_HASH, + "use_newzbin" : checked(headphones.NEWZBIN), + "newzbin_uid" : headphones.NEWZBIN_UID, + "newzbin_pass" : headphones.NEWZBIN_PASSWORD, "pref_qual_0" : radio(headphones.PREFERRED_QUALITY, 0), "pref_qual_1" : radio(headphones.PREFERRED_QUALITY, 1), - "pref_qual_2" : radio(headphones.PREFERRED_QUALITY, 3), - "pref_qual_3" : radio(headphones.PREFERRED_QUALITY, 2), + "pref_qual_3" : radio(headphones.PREFERRED_QUALITY, 3), + "pref_qual_2" : radio(headphones.PREFERRED_QUALITY, 2), "pref_bitrate" : headphones.PREFERRED_BITRATE, "detect_bitrate" : checked(headphones.DETECT_BITRATE), "move_files" : checked(headphones.MOVE_FILES),