Merge branch 'develop' into nfo-orig

2026-07-13 12:34:01 +01:00 · 2014-08-06 23:19:26 +01:00
parent 23e3dd91b3 741538fa3c
commit f2f8ad68a3
120 changed files with 5907 additions and 5673 deletions
@@ -89,9 +89,15 @@
 			<div id="albumImg">
 				<img height="200" alt="" class="albumArt" src="artwork/album/${album['AlbumID']}">
 			</div>
-			
-			<h1><a href="http://musicbrainz.org/release-group/${album['AlbumID']}">${album['AlbumTitle']}</a></h1>
-			<h2><a href="http://musicbrainz.org/artist/${album['ArtistID']}">${album['ArtistName']}</a></h2>
+
+            <h1 id="albumname">
+                <a href="http://musicbrainz.org/release-group/${album['AlbumID']}" id="albumnamelink">${album['AlbumTitle']}</a>
+            </h1>
+
+            <h2 id="artistname">
+                <a href="http://musicbrainz.org/artist/${album['ArtistID']}" id="artistnamelink">${album['ArtistName']}</a>
+            </h2>
+
 			<%
 				totalduration = myDB.action("SELECT SUM(TrackDuration) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0]
 				totaltracks = len(myDB.select("SELECT TrackTitle from tracks WHERE AlbumID=?", [album['AlbumID']]))
@@ -275,9 +281,58 @@
 		feedback.fadeIn();
 	}

+    var loadingMessage = false;
+    var spinner_active = false;
+    var loadingtext_active = false;
+    var refreshInterval;
+    var wasLoading = false;
+    var x = 0;
+
+    function checkAlbumStatus() {
+        $.getJSON("getAlbumjson?AlbumID=${album['AlbumID']}", function(data) {
+            if (data['Status'] == "Loading"){
+                wasLoading = true;
+                $('#albumnamelink').text(data["AlbumTitle"]);
+                $('#artistnamelink').text(data["ArtistName"]);
+                if (loadingMessage == false){
+                    $("#ajaxMsg").after( "<div id='ajaxMsg2' class='ajaxMsg'></div>" );
+                    showArtistMsg("Getting album information");
+                    loadingMessage = true;
+                }
+                if (spinner_active == false){
+                    $('#albumname').prepend('<i class="fa fa-refresh fa-spin" id="albumnamespinner"></i>')
+                    spinner_active = true;
+                }
+                if (loadingtext_active == false){
+                    $('#albumname').append('<h3 id="loadingtext"><i>(Album information is currently being loaded)</i></h3>')
+                    loadingtext_active = true;
+                }
+            }
+            else{
+                if (++x === 10) {
+                    clearInterval(refreshInterval);
+                }
+                var sts = $("#artistname").text();
+                if (wasLoading == true || sts == "Loading"){
+                    location.reload();
+                $('#albumnamespinner').remove()
+                $('#loadingtext').remove()
+                $('#ajaxMsg2').remove()
+                spinner_active = false
+                loadingtext_active = false
+                loadingMessage = false
+                }
+            }
+        });
+    }
+
 	$(document).ready(function()	{
 		getAlbumInfo();
 		initThisPage();
+        checkAlbumStatus();
+        refreshInterval = setInterval(function(){
+            checkAlbumStatus();
+        }, 3000);
 	});

 	</script>
@@ -58,11 +58,11 @@
 				<form action="search" method="get">
 					<input type="text" value="" placeholder="Search" onfocus="if(this.value==this.defaultValue) this.value='';" name="name" />
 					<i class='fa fa-search mini-icon'></i>
-					<select name="type">
+					<select name="type" id="search_type">
 						<option value="artist">Artist</option>
 						<option value="album">Album</option>
 					</select>
-					<input type="submit" value="Add"/>
+					<input type="submit" value="Search"/>
 				</form>
 			</div>

@@ -115,3 +115,25 @@
 <%def name="javascriptIncludes()"></%def>
 <%def name="headIncludes()"></%def>
 <%def name="headerIncludes()"></%def>
+
+<!--persist search type using local storage-->
+<script type="text/javascript">
+
+    $(document).ready(function() {
+        $('form:first *:input[type!=hidden]:first').focus();
+        try{
+            var type = window.localStorage.getItem('search_type');
+            $("#search_type").val(type);
+        } catch(e) {
+        }
+    });
+
+    $('select[id=search_type]').change(function() {
+        var type = $(this).val()
+        try{
+            window.localStorage.setItem('search_type', type);
+        } catch(e) {
+        }
+    });
+
+</script>
@@ -362,22 +362,6 @@
                                    </div>
                                </div>
                            </fieldset>
-                            <fieldset>
-                                <legend>NZBsRus</legend>
-                                <div class="row checkbox">
-                                    <input id="usenzbsrus" type="checkbox" name="nzbsrus" onclick="initConfigCheckbox($(this));" value="1" ${config['use_nzbsrus']} /><label>Use NZBsRus</label>
-                                </div>
-                                <div class="config">
-                                    <div class="row">
-                                        <label>NZBsRus UID</label>
-                                        <input type="text" name="nzbsrus_uid" value="${config['nzbsrus_uid']}" size="10">
-                                    </div>
-                                    <div class="row">
-                                        <label>NZBsRus API Key</label>
-                                        <input type="text" name="nzbsrus_apikey" value="${config['nzbsrus_apikey']}" size="10">
-                                    </div>
-                                </div>
-                            </fieldset>
                            <fieldset>
                                <legend>omgwtfnzbs</legend>
                                <div class="row checkbox">
@@ -390,7 +374,7 @@
                                    </div>
                                    <div class="row">
                                        <label>omgwtfnzbs API Key</label>
-                                        <input type="text" name="omgwtfnzbs_apikey" value="${config['omgwtfnzbs_apikey']}" size="10">
+                                        <input type="text" name="omgwtfnzbs_apikey" value="${config['omgwtfnzbs_apikey']}" size="30">
                                    </div>
                                </div>
                            </fieldset>
@@ -407,14 +391,17 @@
                                        <input type="text" name="piratebay_proxy_url" value="${config['piratebay_proxy_url']}" size="36">
                                    </div>
                                </div>
-                                <div class="row checkbox">
-                                    <input type="checkbox" name="use_isohunt" value="1" ${config['use_isohunt']} /><label>Isohunt</label>
-                                </div>
-                                <div class="row checkbox">
+                                 <div class="row checkbox">
                                    <input type="checkbox" name="use_mininova" value="1" ${config['use_mininova']} /><label>Mininova</label>
                                </div>
                                <div class="row checkbox">
-                                    <input type="checkbox" name="use_kat" value="1" ${config['use_kat']} /><label>Kick Ass Torrents</label>
+                                    <input id="usekat" type="checkbox" name="use_kat" value="1" ${config['use_kat']} /><label>Kick Ass Torrents</label>
+                                </div>
+								<div class="config">
+                                    <div class="row">
+                                        <label>Proxy URL (Optional): </label>
+                                        <input type="text" name="kat_proxy_url" value="${config['kat_proxy_url']}" size="36">
+                                    </div>
                                </div>
                                <div class="row checkbox">
                                    <input id="usewaffles" type="checkbox" name="waffles" onclick="initConfigCheckbox($(this));" value="1" ${config['use_waffles']} /><label>Waffles.fm</label>
@@ -480,12 +467,14 @@
                                    </div>
                                    <input type="radio" id="preferred_bitrate" name="preferred_quality" value="2" ${config['pref_qual_2']}>Preferred Bitrate: <input type="text" class="override-float" name="preferred_bitrate" value="${config['pref_bitrate']}" size="3">kbps<br>
                                    <div id="preferred_bitrate_options">
-                                        Reject if <strong>less than</strong> <input type="text" class="override-float" name="preferred_bitrate_low_buffer" value="${config['pref_bitrate_low']}" size="3">% or <strong>more than</strong> <input type="text" class="override-float" name="preferred_bitrate_high_buffer" value="${config['pref_bitrate_high']}" size="3">% of the target size (leave blank for no limit)<br><br>
-                                        <div class="row checkbox left">
+                                        <span style="padding-left: 20px">
+                                            Reject if <strong>less than</strong> <input type="text" class="override-float" name="preferred_bitrate_low_buffer" value="${config['pref_bitrate_low']}" size="3">% or <strong>more than</strong> <input type="text" class="override-float" name="preferred_bitrate_high_buffer" value="${config['pref_bitrate_high']}" size="3">% of the target size (leave blank for no limit)<br>
+                                        </span>
+                                        <div class="row checkbox left" style="padding-left: 20px">
                                            <input type="checkbox" name="preferred_bitrate_allow_lossless" value="1" ${config['pref_bitrate_allow_lossless']}>
                                            <label>Allow lossless if no good lossy match found</label>
                                        </div>
-                                        <div class="row checkbox left">
+                                        <div class="row checkbox left" style="padding-left: 20px">
                                            <input type="checkbox" name="detect_bitrate" value="1" ${config['detect_bitrate']} />
                                            <label>Auto-Detect Preferred Bitrate</label>
                                        </div>
@@ -1752,9 +1741,9 @@
                initActions();
                initConfigCheckbox("#use_headphones_indexer");
                initConfigCheckbox("#usenewznab");
-                initConfigCheckbox("#usenzbsrus");
                initConfigCheckbox("#usenzbsorg");
                initConfigCheckbox("#useomgwtfnzbs");
+				initConfigCheckbox("#usekat");
                initConfigCheckbox("#usepiratebay");
                initConfigCheckbox("#usewaffles");
                initConfigCheckbox("#userutracker");
@@ -1,4 +1,4 @@
-/* Variables */ 
+/* Variables */ 
@base-font-face:			"Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
@alt-font-face:				"Trebuchet MS", Helvetica, Arial, sans-serif;
@base-font-size:			12px;
@@ -10,20 +10,20 @@
@msg-bg:					#FFF6A9;
@msg-bg-success:			#D3FFD7;
@msg-bg-error:				#FFD3D3;
-
-/* Mixins */
-.rounded(@radius: 5px) {	
-	-moz-border-radius: @radius;
-	-webkit-border-radius: @radius;
-	border-radius: @radius;
-}
-.roundedTop(@radius: 5px) {	
-	-moz-border-radius-topleft: @radius;
-	-moz-border-radius-topright: @radius;
-	-webkit-border-top-right-radius: @radius;
-	-webkit-border-top-left-radius: @radius;
-	border-top-left-radius: @radius;
-	border-top-right-radius: @radius;
+
+/* Mixins */
+.rounded(@radius: 5px) {	
+	-moz-border-radius: @radius;
+	-webkit-border-radius: @radius;
+	border-radius: @radius;
+}
+.roundedTop(@radius: 5px) {	
+	-moz-border-radius-topleft: @radius;
+	-moz-border-radius-topright: @radius;
+	-webkit-border-top-right-radius: @radius;
+	-webkit-border-top-left-radius: @radius;
+	border-top-left-radius: @radius;
+	border-top-right-radius: @radius;
 }
 .roundedLeftTop(@radius: 5px) {	
 	-moz-border-radius-topleft: @radius;
@@ -34,14 +34,14 @@
 	-moz-border-radius-topright: @radius;
 	-webkit-border-top-right-radius: @radius;
 	border-top-right-radius: @radius;
-}
-.roundedBottom(@radius: 5px) {	
-	-moz-border-radius-bottomleft: @radius;
-	-moz-border-radius-bottomright: @radius;
-	-webkit-border-bottom-right-radius: @radius;
-	-webkit-border-bottom-left-radius: @radius;
-	border-bottom-left-radius: @radius;
-	border-bottom-right-radius: @radius;
+}
+.roundedBottom(@radius: 5px) {	
+	-moz-border-radius-bottomleft: @radius;
+	-moz-border-radius-bottomright: @radius;
+	-webkit-border-bottom-right-radius: @radius;
+	-webkit-border-bottom-left-radius: @radius;
+	border-bottom-left-radius: @radius;
+	border-bottom-right-radius: @radius;
 }
 .roundedLeftBottom(@radius: 5px) {	
 	-moz-border-radius-bottomleft: @radius;
@@ -52,7 +52,7 @@
 	-moz-border-radius-bottomright: @radius;
 	-webkit-border-bottom-right-radius: @radius;
 	border-bottom-right-radius: @radius;
-}
+}
 .shadow(@shadow: 0 17px 11px -1px #ced8d9) {
   -moz-box-shadow: @shadow;
   -webkit-box-shadow: @shadow;
@@ -74,4 +74,4 @@
 	-o-opacity:@opacity_percent / 100 !important;
 	opacity:@opacity_percent / 100 !important;
 }
-
+
@@ -503,7 +503,7 @@ header .wrapper {
  margin: 0 auto;
  overflow: hidden;
  position: relative;
-  width: 960px;
+  width: 990px;
 }
 header #logo {
  float: left;
@@ -758,7 +758,7 @@ div#searchbar input[type=text] {
  line-height: normal;
  margin-right: 5px;
  padding: 4px 5px 4px 25px;
-  width: 150px;
+  width: 185px;
 }
 div#searchbar .mini-icon {
  color: #999;
@@ -1126,13 +1126,34 @@ div#artistheader h2 a {
  padding: 2px 10px;
 }
 #searchresults_table th#albumname {
-  min-width: 225px;
+  min-width: 250px;
  text-align: left;
+  font-size: 14px;
 }
 #searchresults_table th#artistname {
  min-width: 325px;
  text-align: left;
 }
+#searchresults_table th#artistnamesmall {
+    min-width: 125px;
+    text-align: left;
+    font-size: 14px;
+}
+#searchresults_table th#reldate {
+    min-width: 80px;
+    text-align: center;
+    font-size: 14px;
+}
+#searchresults_table th#format {
+    min-width: 50px;
+    text-align: left;
+    font-size: 14px;
+}
+#searchresults_table th#tracks {
+    min-width: 50px;
+    text-align: left;
+    font-size: 14px;
+}
 #searchresults_table #artistImg {
  background: url("../images/loader_black.gif") no-repeat scroll center center #ffffff;
  border: 3px solid #FFFFFF;
@@ -1144,15 +1165,40 @@ div#artistheader h2 a {
  width: 50px;
 }
 #searchresults_table td#albumname {
-  min-width: 200px;
+  min-width: 250px;
  text-align: left;
  vertical-align: middle;
+  font-size: 14px;
 }
 #searchresults_table td#artistname {
  min-width: 300px;
  text-align: left;
  vertical-align: middle;
 }
+#searchresults_table td#artistnamesmall {
+    min-width: 100px;
+    text-align: left;
+    vertical-align: middle;
+    font-size: 14px;
+}
+#searchresults_table td#reldate {
+    min-width: 80px;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 14px;
+}
+#searchresults_table td#format {
+    min-width: 50px;
+    text-align: left;
+    vertical-align: middle;
+    font-size: 14px;
+}
+#searchresults_table td#tracks {
+    min-width: 50px;
+    text-align: left;
+    vertical-align: middle;
+    font-size: 14px;
+}
 #searchresults_table td#add {
  vertical-align: middle;
 }
@@ -1416,6 +1462,11 @@ div#artistheader h3 span {
  min-width: 75px;
  text-align: center;
 }
+#searchresults_table th#scoresmall {
+    min-width: 50px;
+    text-align: center;
+    font-size: 14px;
+}
 #track_table td#bitrate,
 #track_table td#format {
  font-size: 12px;
@@ -1,6 +1,7 @@
 <%inherit file="base.html"/>
 <%!
 	from headphones import helpers
+	import cgi
 %>

 <%def name="headerIncludes()">
@@ -51,11 +52,11 @@
 			%>
 			<tr class="grade${grade}">
 				<td id="dateadded">${item['DateAdded']}</td>
-				<td id="filename">${item['Title']} [<a href="${item['URL']}">${fileid}</a>]<a href="albumPage?AlbumID=${item['AlbumID']}">[album page]</a></td>
+				<td id="filename">${cgi.escape(item['Title'], quote=True)} [<a href="${item['URL']}">${fileid}</a>]<a href="albumPage?AlbumID=${item['AlbumID']}">[album page]</a></td>
 				<td id="size">${helpers.bytes_to_mb(item['Size'])}</td>
 				<td id="status">${item['Status']}</td>
-				<td id="action">[<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${item['AlbumID']}&redirect=history', $(this),'table')"  data-success="Retrying download of '${item['Title']}'">retry</a>][<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${item['AlbumID']}&new=True&redirect=history',$(this),'table')"  data-success="Looking for a new version of '${item['Title']}'">new</a>]</td>
-				<td id="delete"><a href="#" onclick="doAjaxCall('clearhistory?date_added=${item['DateAdded']}&title=${item['Title']}',$(this),'table')" data-success="${item['Title']} cleared from history"><img src="interfaces/default/images/trashcan.png" height="18" width="18" id="trashcan" title="Clear this item from the history"></a>
+				<td id="action">[<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${item['AlbumID']}&redirect=history', $(this),'table')"  data-success="Retrying download of '${cgi.escape(item['Title'], quote=True)}'">retry</a>][<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${item['AlbumID']}&new=True&redirect=history',$(this),'table')"  data-success="Looking for a new version of '${cgi.escape(item['Title'], quote=True)}'">new</a>]</td>
+				<td id="delete"><a href="#" onclick="doAjaxCall('clearhistory?date_added=${item['DateAdded']}&title=${cgi.escape(item['Title'], quote=True)}',$(this),'table')" data-success="${cgi.escape(item['Title'], quote=True)} cleared from history"><img src="interfaces/default/images/trashcan.png" height="18" width="18" id="trashcan" title="Clear this item from the history"></a>
 			</tr>
 		%endfor
 		</tbody>
@@ -11,36 +11,49 @@
 				<th id="albumart"></th>
 				%if type == 'album':
 					<th id="albumname">Album Name</th>
+                    <th id="artistnamesmall">Artist Name</th>
+                    <th id="format">Format</th>
+                    <th id="tracks">Tracks</th>
+                    <th id="reldate">Date</th>
+                    <th id="scoresmall">Score</th>
+                %else:
+                    <th id="artistname">Artist Name</th>
+                    <th id="score">Score</th>
 				%endif
-				<th id="artistname">Artist Name</th>
-				<th id="score">Score</th>
-				<th id="add"></th>
+                <th id="mb"></th>
 			</tr>
 		</thead>
 		<tbody>
 			%if searchresults:
-				%for result in searchresults:
-				<%
-					if result['score'] == 100:
-						grade = 'A'
-					else:
-						grade = 'Z'
-				%>
+                %for result in searchresults:
+                <%
+                    if result['score'] == 100:
+                        grade = 'A'
+                    else:
+                        grade = 'Z'
+
+                    if type == 'album':
+                        albuminfo = 'Type: ' + result['rgtype'] + ', Country: ' + result['country']
+                        caa_group_url = "http://coverartarchive.org/release-group/%s/front-250.jpg" %result['rgid']
+                %>
 				<tr class="grade${grade}">
 				%if type == 'album':
-					<td id="albumart"><div id="artistImg"><img title="${result['albumid']}" class="albumArt" height="50" width="50"></div></td>
+					<td id="albumart" style=" text-align: center; vertical-align: middle;"><div id="artistImg"><img title="${result['albumid']}" class="albumArt" height="50" width="50" onerror="this.src='${caa_group_url}'"></div></td>
 				%else:
 					<td id="albumart"><div id="artistImg"><img title="${result['id']}" class="albumArt" height="50" width="50"></div></td>
 				%endif
 				%if type == 'album':
-					<td id="albumname"><a href="${result['albumurl']}">${result['title']}</a></td>
-				%endif
-					<td id="artistname"><a href="addArtist?artistid=${result['id']}" title="${result['uniquename']}">${result['uniquename']}</a></td>
-					<td id="score"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></td>
-				%if type == 'album':
-					<td id="add"><a href="addReleaseById?rid=${result['albumid']}"><i class="fa fa-plus"></i> Add this album</a></td>
-				%else:
-					<td id="add"><a href="${result['url']}"></i> View on MusicBrainz</a></td>
+					<td id="albumname"><a href="addReleaseById?rid=${result['albumid']}&rgid=${result['rgid']}" title="${albuminfo}">${result['title']}</a></td>
+                    <td id="artistnamesmall"><a href="addArtist?artistid=${result['id']}" title="${result['uniquename']}">${result['uniquename']}</a></td>
+                    <td id="format">${result['formats']}</td>
+                    <td id="tracks">${result['tracks']}</td>
+                    <td id="reldate">${result['date']}</td>
+                    <td id="score"><a href="${result['albumurl']} "title="View on MusicBrainz"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></a></td>
+                    <td id="musicbrainz" style=" text-align: center; line-height: 0; vertical-align: middle;"><a href="${result['albumurl']}"><img src="interfaces/default/images/MusicBrainz_Album_Icon.png" title="View on MusicBrainz" height="20" width="20"></a></td>
+                %else:
+                    <td id="artistname"><a href="addArtist?artistid=${result['id']}" title="${result['uniquename']}">${result['uniquename']}</a></td>
+                    <td id="score"><a href="${result['url']} "title="View on MusicBrainz"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></a></td>
+                    <td id="musicbrainz" style=" text-align: center; line-height: 0; vertical-align: middle;"><a href="${result['url']}"><img src="interfaces/default/images/MusicBrainz_Artist_Icon.png" title="View on MusicBrainz" height="20" width="20"></a></td>
 				%endif
 				</tr>
 				%endfor
@@ -75,7 +88,7 @@
 			{
 				"bDestroy": true,
 				"aoColumnDefs": [
-			          { 'bSortable': false, 'aTargets': [ 0,3 ] }
+			          { 'bSortable': false, 'aTargets': [ 0 ] }
 				],
 				"oLanguage": {
 					"sLengthMenu":"Show _MENU_ results per page",