Added unmatched tracks to album page, added bit rate

data/interfaces/default/album.html

@@ -62,7 +62,7 @@
 							grade = 'A'
 							location = track['Location']
 						else:
-							grade = 'Z'
+							grade = 'X'
 							location = ''
 							
 						if track['BitRate']:
@@ -83,35 +83,25 @@
 						<td id="bitrate">${bitrate}</td>
 					</tr>
 				%endfor
-				</tbody>
-			</table>
-			<%
-				unmatched = myDB.select('SELECT * from have WHERE ArtistName LIKE ? AND AlbumTitle LIKE ?', [album['ArtistName'], album['AlbumTitle']])
-			%>
-			%if unmatched:
-			<table class="display" id="track_table">
-				<thead>
-					<tr>
-						<th id="number">#</th>
-						<th id="name">Track Title</th>
-						<th id="duration">Duration</th>
-						<th id="location">Local File</th>
-						<th id="bitrate">Bit Rate</th>
-					</tr>
-				</thead>
-				<tbody>
-				%for track in unmatched:
-					<tr class="gradeZ">
+				<%
+				unmatched = myDB.select('SELECT * from have WHERE ArtistName LIKE ? AND AlbumTitle LIKE ?', [album['ArtistName'], album['AlbumTitle']])			
+				%>
+				%if unmatched:
+					 %for track in unmatched:
+					 <%
+					 	duration = helpers.convert_seconds(float(track['TrackLength']))
+					 %>
+					<tr class="gradeC">
 						<td id="number">${track['TrackNumber']}</td>
 						<td id="name">${track['TrackTitle']}</td>
-						<td id="duration">${track['TrackLength']}</td>
+						<td id="duration">${duration}</td>
 						<td id="location">${track['Location']}</td>
-						<td id="bitrate">${track['BitRate']}</td>
+						<td id="bitrate">${int(track['BitRate'])/1000} kbps</td>
 					</tr>
-				%endfor
+					%endfor
+				%endif
 				</tbody>
 			</table>
-			%endif
 		</div>
 	</div>
 </%def>
@@ -127,6 +117,7 @@
 	{
 		$('#track_table').dataTable(
 			{
+				"aaSorting": [],
 				"bFilter": false,
 				"bInfo": false,
 				"bPaginate": false

data/interfaces/default/artist.html

@@ -63,7 +63,7 @@
 
 				myDB = db.DBConnection()					
 				totaltracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=?', [album['AlbumID']]))
-				havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=? AND Location IS NOT NULL', [album['AlbumID']]))
+				havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE AlbumID=? AND Location IS NOT NULL', [album['AlbumID']])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ? AND AlbumTitle LIKE ?', [album['ArtistName'], album['AlbumTitle']]))
 				
 				try:
 					percent = (havetracks*100.0)/totaltracks

headphones/__init__.py

@@ -429,7 +429,7 @@ def start():
 
         SCHED.add_cron_job(updater.dbUpdate, hour=4, minute=0, second=0)
         SCHED.add_interval_job(searcher.searchNZB, minutes=NZB_SEARCH_INTERVAL)
-        SCHED.add_interval_job(librarysync.libraryScan(), minutes=LIBRARYSCAN_INTERVAL)
+        SCHED.add_interval_job(librarysync.libraryScan, minutes=LIBRARYSCAN_INTERVAL)
         SCHED.add_interval_job(versioncheck.checkGithub, minutes=300)
         SCHED.add_interval_job(postprocessor.checkFolder, minutes=DOWNLOAD_SCAN_INTERVAL)
         librarysync.libraryScan()

headphones/helpers.py

@@ -84,6 +84,16 @@ def convert_milliseconds(ms):
 
 	return minutes
 	
+def convert_seconds(s):
+
+	gmtime = time.gmtime(s)
+	if s > 3600:
+		minutes = time.strftime("%H:%M:%S", gmtime)
+	else:
+		minutes = time.strftime("%M:%S", gmtime)
+
+	return minutes
+	
 def today():
 	today = datetime.date.today()
 	yyyymmdd = datetime.date.isoformat(today)

headphones/importer.py

@@ -45,7 +45,7 @@ def artistlist_to_mbids(artistlist):
 		# Just update the tracks if it does
 		else:
 			myDB = db.DBConnection()
-			havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE ArtistID=?', [artistid])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ?', [artist['ArtistName']]))
+			havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE ArtistID=?', [artistid])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ?', [artist]))
 			myDB.action('UPDATE artists SET HaveTracks=? WHERE ArtistID=?', [havetracks, artistid])
 			
 	# Update the similar artist tag cloud:

headphones/librarysync.py

@@ -152,18 +152,17 @@ def libraryScan():
 			
 	# Clean up the new artist list
 	unique_artists = {}.fromkeys(new_artists).keys()
-	current_artists = myDB.select('SELECT ArtistName from artists')
+	current_artists = myDB.select('SELECT ArtistName, ArtistID from artists')
 	
 	artist_list = [f for f in unique_artists if f.lower() not in [x[0].lower() for x in current_artists]]
 	
-	logger.info('Found %i new artists to import.' % len(artist_list))
-	
 	# Update track counts
 	for artist in current_artists:
-		havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE ArtistID like ?', [artist['ArtistID']])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ?', [artist['ArtistName']]))
+		havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE ArtistID like ? AND Location IS NOT NULL', [artist['ArtistID']])) + len(myDB.select('SELECT TrackTitle from have WHERE ArtistName like ?', [artist['ArtistName']]))
 		myDB.action('UPDATE artists SET HaveTracks=? WHERE ArtistID=?', [havetracks, artist['ArtistID']])
 		
 	if headphones.ADD_ARTISTS:
+		logger.info('Found %i new artists to import.' % len(artist_list))
 		importer.artistlist_to_mbids(artist_list)
 	else:
 		headphones.NEW_ARTISTS = artist_list

headphones/postprocessor.py

@@ -240,7 +240,6 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list)
 	myDB.action('UPDATE artists SET HaveTracks=? WHERE ArtistID=?', [new_track_count, release['ArtistID']])
 	myDB.action('UPDATE albums SET status = "Downloaded" WHERE AlbumID=?', [albumid])
 	myDB.action('UPDATE snatched SET status = "Processed" WHERE AlbumID=?', [albumid])
-	updateHave(albumpath)
 	
 	logger.info('Post-processing for %s - %s complete' % (release['ArtistName'], release['AlbumTitle']))
 	
@@ -421,36 +420,6 @@ def renameFiles(albumpath, downloaded_track_list, release):
 		except Exception, e:
 			logger.error('Error renaming file: %s. Error: %s' % (downloaded_track, e))
 			continue
-		
-def updateHave(albumpath):
-
-	results = []
-	
-	for r,d,f in os.walk(albumpath):
-		for files in f:
-			if any(files.endswith('.' + x) for x in headphones.MEDIA_FORMATS):
-				results.append(os.path.join(r, files))
-	
-	if results:
-	
-		myDB = db.DBConnection()
-	
-		for song in results:
-			try:
-				f = MediaFile(song)
-				#logger.debug('Reading: %s' % song.decode('UTF-8'))
-			except:
-				logger.warn('Could not read file: %s' % song)
-				continue
-			else:	
-				if f.albumartist:
-					artist = f.albumartist
-				elif f.artist:
-					artist = f.artist
-				else:
-					continue
-				
-				myDB.action('INSERT INTO have VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?)', [artist, f.album, f.track, f.title, f.length, f.bitrate, f.genre, f.date, f.mb_trackid])
 				
 def renameUnprocessedFolder(albumpath):