Updated the newzbin url in searcher.py

data/interfaces/default/album.html

@@ -54,6 +54,7 @@
 						<th id="duration">Duration</th>
 						<th id="location">Local File</th>
 						<th id="bitrate">Bit Rate</th>
+						<th id="format">Format</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -75,6 +76,11 @@
 							trackduration = helpers.convert_milliseconds(track['TrackDuration'])
 						except:
 							trackduration = 'n/a'
+
+						if not track['Format']:
+							format = 'Unknown'
+						else:
+							format = track['Format']
 					%>
 					<tr class="grade${grade}">
 						<td id="number">${track['TrackNumber']}</td>
@@ -82,6 +88,7 @@
 						<td id="duration">${trackduration}</td>
 						<td id="location">${location}</td>
 						<td id="bitrate">${bitrate}</td>
+						<td id="format">${format}</td>
 					</tr>
 				%endfor
 				<%
@@ -98,6 +105,7 @@
 						<td id="duration">${duration}</td>
 						<td id="location">${track['Location']}</td>
 						<td id="bitrate">${int(track['BitRate'])/1000} kbps</td>
+						<td id="format">${track['Format']}</td>
 					</tr>
 					%endfor
 				%endif
@@ -125,4 +133,4 @@
 			});
 	});
 	</script>
-</%def>
+</%def>

data/interfaces/default/artist.html

@@ -1,6 +1,7 @@
 <%inherit file="base.html"/>
 <%!
 	from headphones import db
+	import headphones
 %>
 
 <%def name="headerIncludes()">
@@ -50,6 +51,7 @@
 				<th id="status">Status</th>
 				<th id="have">Have</th>
 				<th id="bitrate">Bitrate</th>
+				<th id="albumformat">Format</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -81,7 +83,17 @@
 					bitrate = str(int(avgbitrate)/1000) + ' kbps'
 				else:
 					bitrate = ''
-				
+
+				albumformatcount = myDB.action("SELECT COUNT(DISTINCT Format) FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0]
+				if albumformatcount == 1:
+					albumformat = myDB.action("SELECT DISTINCT Format FROM tracks WHERE AlbumID=?", [album['AlbumID']]).fetchone()[0]
+				elif albumformatcount > 1:
+					albumformat = 'Mixed'
+				else:
+					albumformat = ''
+
+				lossy_formats = [str.upper(fmt) for fmt in headphones.LOSSY_MEDIA_FORMATS]
+
 			%>
 			<tr class="grade${grade}">
 				<td id="select"><input type="checkbox" name="${album['AlbumID']}" class="checkbox" /></td>
@@ -92,14 +104,20 @@
 				<td id="status">${album['Status']}
 				%if album['Status'] == 'Skipped':
 					[<a href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}">want</a>]
-				%elif album['Status'] == 'Wanted':
+				%elif (album['Status'] == 'Wanted' or album['Status'] == 'Wanted Lossless'):
 					[<a href="unqueueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}">skip</a>]
 				%else:
 					[<a href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Retry the same download again">retry</a>][<a href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&new=True" title="Try a new download, skipping all previously tried nzbs">new</a>]
 				%endif
+				%if albumformat in lossy_formats and album['Status'] == 'Skipped':
+					[<a id="wantlossless" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&lossless=True">want lossless</a>]
+				%elif albumformat in lossy_formats and (album['Status'] == 'Snatched' or album['Status'] == 'Downloaded'):
+					[<a id="wantlossless" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&lossless=True">retry lossless</a>]
+				%endif
 				</td>
 				<td id="have"><span title="${percent}"><span><div class="progress-container"><div style="width:${percent}%"><div class="havetracks">${havetracks}/${totaltracks}</div></div></div></td>
 				<td id="bitrate">${bitrate}</td>
+				<td id="albumformat">${albumformat}</td>
 			</tr>
 		%endfor
 		</tbody>
@@ -129,6 +147,7 @@
 					null,
 					null,
 					{ "sType": "title-numeric"},
+					null,
 					null
 				],
 				"oLanguage": {