From f9a02d9b3bb629bf45bb1a1fa6fdaeafb2a482a1 Mon Sep 17 00:00:00 2001 From: Ade Date: Fri, 18 Sep 2015 18:16:39 +1200 Subject: [PATCH] Get folder name working in history + show magnet as torrent --- data/interfaces/default/history.html | 7 +++---- headphones/webserve.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index c410b2c4..9a1079ba 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -50,15 +50,14 @@ fileid = 'nzb' if item['URL'].find('torrent') != -1: fileid = 'torrent' + if item['URL'].find('magnet:') != -1: + fileid = 'torrent' if item['URL'].find('rutracker') != -1: fileid = 'torrent' if item['URL'].find('codeshy') != -1: fileid = 'nzb' - if 'FolderName' in item: - folder = 'Folder: ' + item['FolderName'] - else: - folder = 'Folder: ?' + folder = 'Folder: ' + item['FolderName'] %> diff --git a/headphones/webserve.py b/headphones/webserve.py index 121e8667..815c5e9f 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -814,7 +814,7 @@ class WebInterface(object): @cherrypy.expose def history(self): myDB = db.DBConnection() - history = myDB.select('''SELECT * from snatched WHERE Status NOT LIKE "Seed%" order by DateAdded DESC''') + history = myDB.select('''SELECT AlbumID, Title, Size, URL, DateAdded, Status, Kind, ifnull(FolderName, '?') FolderName FROM snatched WHERE Status NOT LIKE "Seed%" ORDER BY DateAdded DESC''') return serve_template(templatename="history.html", title="History", history=history) @cherrypy.expose