From 83280f3f999268aeae785638b55080068c672a73 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Mon, 5 May 2014 23:43:32 -0700 Subject: [PATCH 1/4] Fix for #1603, typo in utorrent --- headphones/utorrent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headphones/utorrent.py b/headphones/utorrent.py index 7aad16f5..fbf1a462 100644 --- a/headphones/utorrent.py +++ b/headphones/utorrent.py @@ -63,7 +63,7 @@ def addTorrent(link): response = request.request_json(host, params=params, auth=auth, cookies=cookies) else: params = {'action':'add-file', 'token':token} - files = {'torrent_file':{'music.torrent', link}} + files = {'torrent_file':{'music.torrent' : link}} response = request.request_json(host, method="post", params=params, files=files, auth=auth, cookies=cookies) if not response: logger.error("Error sending torrent to uTorrent") From ea3c6c327809d25e8b9808872d4a7b7fb018219e Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 6 May 2014 11:06:31 -0700 Subject: [PATCH 2/4] Changed VERBOSE back to 1 --- headphones/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headphones/__init__.py b/headphones/__init__.py index 40e085e1..380a31bf 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -38,7 +38,7 @@ SIGNAL = None SYS_PLATFORM = None SYS_ENCODING = None -VERBOSE = 2 +VERBOSE = 1 DAEMON = False CREATEPID = False PIDFILE= None From 9fce4edf002620831e7a2f6bbee3ce5f63c6469c Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 6 May 2014 11:21:37 -0700 Subject: [PATCH 3/4] Fix for #1598, everything bring updated, even albums older than pause_delta --- headphones/importer.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/headphones/importer.py b/headphones/importer.py index d73293ef..6a7f79ed 100644 --- a/headphones/importer.py +++ b/headphones/importer.py @@ -231,22 +231,32 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): if not forcefull: + new_release_group = False + try: check_release_date = rg_exists['ReleaseDate'] except TypeError: check_release_date = None + new_release_group = True - if check_release_date: - if check_release_date[0] is None: + + if new_release_group: + + logger.info("[%s] Now adding: %s (New Release Group)" % (artist['artist_name'], rg['title'])) + new_releases = mb.get_new_releases(rgid,includeExtras) + + else: + + if check_release_date is None or check_release_date == u"None": logger.info("[%s] Now updating: %s (No Release Date)" % (artist['artist_name'], rg['title'])) new_releases = mb.get_new_releases(rgid,includeExtras,True) else: - if len(check_release_date[0]) == 10: - release_date = check_release_date[0] - elif len(check_release_date[0]) == 7: - release_date = check_release_date[0]+"-31" - elif len(check_release_date[0]) == 4: - release_date = check_release_date[0]+"-12-31" + if len(check_release_date) == 10: + release_date = check_release_date + elif len(check_release_date) == 7: + release_date = check_release_date+"-31" + elif len(check_release_date) == 4: + release_date = check_release_date+"-12-31" else: release_date = today if helpers.get_age(today) - helpers.get_age(release_date) < pause_delta: @@ -256,9 +266,6 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): logger.info("[%s] Skipping: %s (Release Date >%s Days)" % (artist['artist_name'], rg['title'], pause_delta)) skip_log = 1 new_releases = 0 - else: - logger.info("[%s] Now adding: %s (New Release Group)" % (artist['artist_name'], rg['title'])) - new_releases = mb.get_new_releases(rgid,includeExtras) if force_repackage == 1: new_releases = -1 From e10893543062a86bf310a54869bebec969c373c3 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 6 May 2014 17:01:30 -0700 Subject: [PATCH 4/4] Fix for spinner not showing up anymore when marking albums as wanted --- data/interfaces/default/artist.html | 8 ++++---- data/interfaces/default/base.html | 2 +- data/interfaces/default/css/style.css | 12 ++++++------ data/interfaces/default/js/script.js | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 11 deletions(-) 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/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");