From f3fc621de1e8de40b541b9eb7349d07a020b7b26 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hummypkg.org.uk>
Date: Wed, 10 Oct 2018 22:18:55 +0100
Subject: [PATCH] Updates for queued URIs

---
 CONTROL/control                 | 2 +-
 webif/html/diag/queue/script.js | 9 +++++++--
 webif/lib/queue.class           | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 4b9797e..81e6857 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.4
+Version: 1.4.4-1
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.26),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.11),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98-3),sqlite3(>=3.15.1),jim-xconv
diff --git a/webif/html/diag/queue/script.js b/webif/html/diag/queue/script.js
index f871b23..ad6a213 100644
--- a/webif/html/diag/queue/script.js
+++ b/webif/html/diag/queue/script.js
@@ -176,8 +176,13 @@ $('button.refresh').button({icons:{primary:"ui-icon-refresh"}})
 $('#queuetab').on('click', 'a.file', function(e) {
 	e.preventDefault();
 	file = $(this).html();
-	window.location = '/go/browse?dir=' +
-	    encodeURIComponent('{root}/' + dirname(file));
+	if (file.includes('file://'))
+		return;
+	else if (file.includes('://'))
+		window.location = file;
+	else
+		window.location = '/go/browse?dir=' +
+		    encodeURIComponent('{root}/' + dirname(file));
 });
 
 setInterval(load, 60000);
diff --git a/webif/lib/queue.class b/webif/lib/queue.class
index a3f99fa..4f8011a 100644
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -127,7 +127,7 @@ proc {queue fetch} {file action} {
 		select * from queue
 		where file = '%s'
 		and action = '%s'
-	} [file normalize $file] $action] {
+	} $file $action] {
 		return [queue new $row]
 	}
 	return {}