diff --git a/Headphones.py b/Headphones.py index 480caf08..10ab2e44 100755 --- a/Headphones.py +++ b/Headphones.py @@ -77,16 +77,16 @@ def main(): args = parser.parse_args() if args.verbose: - headphones.VERBOSE = 2 - elif args.quiet: - headphones.VERBOSE = 0 + headphones.VERBOSE = True + if args.quiet: + headphones.QUIET = True if args.daemon: if sys.platform == 'win32': print "Daemonize not supported under Windows, starting normally" else: - headphones.DAEMON=True - headphones.VERBOSE = False + headphones.DAEMON = True + headphones.QUIET = True if args.pidfile: headphones.PIDFILE = str(args.pidfile) @@ -101,7 +101,7 @@ def main(): try: file(headphones.PIDFILE, 'w').write("pid\n") except IOError, e: - raise SystemExit("Unable to write PID file: %s [%d]" % (e.strerror, e.errno)) + raise SystemExit("Unable to write PID file: %s [%d]", e.strerror, e.errno) else: logger.warn("Not running in daemon mode. PID file creation disabled.") diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html index 863a4717..c5f21ccf 100644 --- a/data/interfaces/default/artist.html +++ b/data/interfaces/default/artist.html @@ -240,7 +240,8 @@ refreshTable(); $('#artistnamelink').text(data["ArtistName"]); if (loadingMessage == false){ - showMsg("Getting artist information",true); + $("#ajaxMsg").after( "
" ); + showArtistMsg("Getting artist information"); loadingMessage = true; } if (spinner_active == false){ @@ -255,8 +256,7 @@ else{ $('#artistnamespinner').remove() $('#loadingtext').remove() - $('#ajaxMsg').empty() - $('#ajaxMsg').removeAttr('style') + $('#ajaxMsg2').remove() spinner_active = false loadingtext_active = false loadingMessage = false @@ -303,7 +303,7 @@ resetFilters("albums"); setTimeout(function(){ initFancybox(); - },1500) + },1500); } $(document).ready(function() { diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 326a02cf..e606a02b 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -29,7 +29,7 @@
-
+
% if not headphones.CURRENT_VERSION:
You're running an unknown version of Headphones. Update or diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index d38fa710..5ee7a95b 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -470,7 +470,14 @@
- + +
+ + Reject if target size is not in bitrate range: \ + to\ + kbps + +
Preferred Bitrate: kbps
Reject if less than % or more than % of the target size (leave blank for no limit)

@@ -496,7 +503,7 @@
- Results with these words in the title will be preferred over results without them + Results with these words in the title will be preferred over results without them (search provider names can also be entered)
@@ -1587,6 +1594,15 @@ } }); + if ($("#lossless_only").is(":checked")) + { + $("#lossless_only_options").show(); + } + else + { + $("#lossless_only_options").hide(); + } + if ($("#preferred_bitrate").is(":checked")) { $("#preferred_bitrate_options").show(); @@ -1632,18 +1648,22 @@ if ($("#preferred_bitrate").is(":checked")) { $("#preferred_bitrate_options").slideDown("fast"); + $("#lossless_only_options").slideUp("fast"); } if ($("#preferred_quality0").is(":checked")) { $("#preferred_bitrate_options").slideUp("fast"); + $("#lossless_only_options").slideUp("fast"); } if ($("#preferred_quality1").is(":checked")) { $("#preferred_bitrate_options").slideUp("fast"); + $("#lossless_only_options").slideUp("fast"); } - if ($("#preferred_quality3").is(":checked")) + if ($("#lossless_only").is(":checked")) { - $("#preferred_bitrate_options").slideUp("fast"); + $("#lossless_only_options").slideDown("fast"); + $("#preferred_bitrate_options").slideUp("fast"); } if ($("#nzb_downloader_sabnzbd").is(":checked")) { diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index 0bcf383f..6789726f 100644 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -545,7 +545,7 @@ footer { position: relative; top: 4px; } -#ajaxMsg { +.ajaxMsg { border: 1px solid #cccccc; background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; background-image: linear-gradient(#ffffff, #eeeeee) !important; @@ -576,16 +576,16 @@ footer { -o-opacity: 0.8 !important; opacity: 0.8 !important; } -#ajaxMsg .msg { +.ajaxMsg .msg { font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; line-height: normal; padding-left: 20px; } -#ajaxMsg .loader { +.ajaxMsg .loader { position: relative; top: 2px; } -#ajaxMsg.success { +.ajaxMsg .success { background-image: -moz-linear-gradient(#d3ffd7, #c2edc6) !important; background-image: linear-gradient(#d3ffd7, #c2edc6) !important; background-image: -webkit-linear-gradient(#d3ffd7, #c2edc6) !important; @@ -595,7 +595,7 @@ footer { padding: 15px 10px; text-align: left; } -#ajaxMsg.error { +.ajaxMsg .error { background-image: -moz-linear-gradient(#ffd3d3, #edc4c4) !important; background-image: linear-gradient(#ffd3d3, #edc4c4) !important; background-image: -webkit-linear-gradient(#ffd3d3, #edc4c4) !important; @@ -605,7 +605,7 @@ footer { padding: 15px 10px; text-align: left; } -#ajaxMsg .ui-icon { +.ajaxMsg .ui-icon { display: inline-block; margin-left: -20px; top: 2px; diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index b2e56b52..33eec003 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -228,6 +228,21 @@ function showMsg(msg,loader,timeout,ms) { } } +function showArtistMsg(msg) { + var feedback = $("#ajaxMsg2"); + update = $("#updatebar"); + if ( update.is(":visible") ) { + var height = update.height() + 35; + feedback.css("bottom",height + "px"); + } else { + feedback.removeAttr("style"); + } + feedback.fadeIn(); + var message = $(" " + msg + "
"); + feedback.css("padding","14px 10px") + $(feedback).prepend(message); +} + function doAjaxCall(url,elem,reload,form) { // Set Message feedback = $("#ajaxMsg"); diff --git a/data/interfaces/default/searchresults.html b/data/interfaces/default/searchresults.html index b790f644..b6083c51 100644 --- a/data/interfaces/default/searchresults.html +++ b/data/interfaces/default/searchresults.html @@ -35,12 +35,12 @@ %if type == 'album': ${result['title']} %endif - ${result['uniquename']} + ${result['uniquename']}
${result['score']}
- %if type == 'album': + %if type == 'album': Add this album %else: - Add this artist + View on MusicBrainz %endif %endfor @@ -57,10 +57,10 @@ <%def name="javascriptIncludes()"> - +