From d1d45c21d43eb7b55d4d221939e90eca920e3156 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Tue, 8 Apr 2014 20:17:57 -0700
Subject: [PATCH] Added ability to delete single history items

---
 data/interfaces/default/css/style.css       |   1 +
 data/interfaces/default/history.html        |   2 ++
 data/interfaces/default/images/trashcan.png | Bin 0 -> 3317 bytes
 headphones/webserve.py                      |  16 ++++++++++------
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 data/interfaces/default/images/trashcan.png

diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css
index 1c77c778..4e7b0739 100644
--- a/data/interfaces/default/css/style.css
+++ b/data/interfaces/default/css/style.css
@@ -1236,6 +1236,7 @@ div#artistheader h2 a {
   position: relative;
   top: 7px;
 }
+#trashcan {margin-top:15px;}
 .cloudtag {
   font-size: 16px;
 }
diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index baf72b3d..b7cef364 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -26,6 +26,7 @@
 				<th id="size">Size</th>
 				<th id="status">Status</th>
 				<th id="action"></th>
+				<th id="delete"></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -54,6 +55,7 @@
 				<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>
 			</tr>
 		%endfor
 		</tbody>
diff --git a/data/interfaces/default/images/trashcan.png b/data/interfaces/default/images/trashcan.png
new file mode 100644
index 0000000000000000000000000000000000000000..de10cbda45ea7a635d328f5e058272c0ab850cd0
GIT binary patch
literal 3317
zcmZ`*cRbYpA3t2#qq0-3i<59CqcYAq=bYro$jLnO?6{nfnGsHQheAeXMp0Hr_WZhJ
zr9!f@Q?icy=sSMn@%X(TkN0|hp3mp&{d&FMe|)0#^-%0Af-C?4fE}%^dE;>AIO<Ht
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
Z=1;c{KFf(jitZh~B{Wh`vs}YE>|Zg*4G#bS

literal 0
HcmV?d00001

diff --git a/headphones/webserve.py b/headphones/webserve.py
index ab923cd2..497ecd7b 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -843,14 +843,18 @@ class WebInterface(object):
         return json_albums
     getAlbumsByArtist_json.exposed=True
 
-    def clearhistory(self, type=None):
+    def clearhistory(self, type=None, date_added=None, title=None):
         myDB = db.DBConnection()
-        if type == 'all':
-            logger.info(u"Clearing all history")
-            myDB.action('DELETE from snatched')
+        if type:
+            if type == 'all':
+                logger.info(u"Clearing all history")
+                myDB.action('DELETE from snatched')
+            else:
+                logger.info(u"Clearing history where status is %s" % type)
+                myDB.action('DELETE from snatched WHERE Status=?', [type])
         else:
-            logger.info(u"Clearing history where status is %s" % type)
-            myDB.action('DELETE from snatched WHERE Status=?', [type])
+            logger.info(u"Deleting '%s' from history" % title)
+            myDB.action('DELETE from snatched WHERE Title=? AND DateAdded=?', [title, date_added])
         raise cherrypy.HTTPRedirect("history")
     clearhistory.exposed = True