From 3aa178a4a67c4193e8d9d72e022b52d8d3e6075c Mon Sep 17 00:00:00 2001
From: Remy <remyvarma@gmail.com>
Date: Sat, 23 Jul 2011 16:03:39 -0700
Subject: [PATCH] Added logging to WebUI (refresh browser if the font is huge
 so it uses the new css)

---
 data/css/style.css      |  4 ++++
 headphones/mb.py        |  6 ++----
 headphones/templates.py |  3 ++-
 headphones/webserve.py  | 18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/data/css/style.css b/data/css/style.css
index 2632ced6..57735a2e 100644
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -99,6 +99,10 @@ h1{
 	font-size: 16px;
 	margin-left: 100px;
 	}
+.logtext{
+	font-size: 14px;
+	padding: 4px
+	}
 .bigtext{
 	font-size: 22px;
 	}
diff --git a/headphones/mb.py b/headphones/mb.py
index bd71f89c..dca525af 100644
--- a/headphones/mb.py
+++ b/headphones/mb.py
@@ -25,14 +25,12 @@ def findArtist(name, limit=1):
 		
 		chars = set('!?')
 		if any((c in chars) for c in name):
-			term = '"'+name+'"'
-		else:
-			term = name
+			name = '"'+name+'"'
 		
 		while attempt < 5:
 		
 			try:
-				artistResults = q.getArtists(ws.ArtistFilter(query=term, limit=limit))
+				artistResults = q.getArtists(ws.ArtistFilter(query=name, limit=limit))
 				break
 			except WebServiceError, e:
 				logger.warn('Attempt to query MusicBrainz for %s failed: %s' % (name, e))
diff --git a/headphones/templates.py b/headphones/templates.py
index 979920f4..993219b3 100644
--- a/headphones/templates.py
+++ b/headphones/templates.py
@@ -34,6 +34,7 @@ _nav = '''<div class="nav">
 					<a href="upcoming">UPCOMING</a>
 					<a href="manage">MANAGE</a>    
 					<a href="history">HISTORY</a>
+					<a href="logs">LOGS</a>
 					<a href="config">SETTINGS</a>
 					<div style="float:right">
 					  <a href="restart" title="Restart"><img src="images/restart.png" height="15px" width="15px" border="0"></a>
@@ -148,7 +149,7 @@ configform = form = '''
 
                     <p>Music Download Directory:</p><input type="text" name="download_dir" value="%s" size="60"><br>
 
-                    <i class="smalltext">Absolute or relative path to the dir where SAB downloads your music<br>
+                    <i class="smalltext">Full path to the directory where SAB downloads your music<br>
                     i.e. Downloads/music or /Users/name/Downloads/music</i>
                 </td>
             </tr>
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 10a4feee..f8550055 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -487,6 +487,24 @@ class WebInterface(object):
 		return page
 	history.exposed = True
 	
+	def logs(self):
+		page = [templates._header]
+		page.append(templates._logobar)
+		page.append(templates._nav)
+		page.append('''<div class="table"><p class="logtext">''')
+		fileHandle = open(os.path.join(headphones.LOG_DIR, 'headphones.log'))
+		lineList = fileHandle.readlines()
+		fileHandle.close()
+		i = -1
+		while i > -100:
+			page.append(lineList[i] + '<br /><br />')
+			i -= 1
+		page.append('''</p></div>''')
+		page.append(templates._footer % headphones.CURRENT_VERSION)
+		return page
+	
+	logs.exposed = True
+	
 	def clearhistory(self):
 
 		logger.info(u"Clearing history")