From 086814cafa5b2e9e5b4ede70dcf29362ec8953b1 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 10 Nov 2020 14:04:20 +0000
Subject: [PATCH 01/91] Add thumbnail viewer to Manage Bookmarks

---
 webif/html/browse/bookmarks/index.jim | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index b12c9372..fae94b7f 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -15,6 +15,10 @@ set erfile [string map {' \\'} $rfile]
 
 set len [$ts duration 1]
 
+set start -1
+set incr 1
+set limit $(1-$start)
+
 puts "
 <script type=text/javascript>
 var initbookmarks = '[$ts bookmarks]';
@@ -39,6 +43,24 @@ var dir = '$dir';
 <button class=left id=addbmark>Add Bookmark</button>
 <button class=left id=delbmark>Remove Bookmark</button>
 </td><td><div id=slider></div></td></tr>
+<tr><td align=right>
+<span class=left>Current: <span id=curbmk></span></span><br><br><br>
+<button id=genthumbs title=\"Generate Thumbnails\" class=left>Generate Thumbnails</button>
+</td><td>
+<div id=thumbs class=hidden>
+<table><tr>"
+set times {}
+loop v $start $limit $incr {
+    lappend times $v
+    puts "<th style=\"text-align: center\"><span class=mark>[format "%+d" $v]</span>s</th>"
+}
+puts "</tr><tr>"
+foreach v $times {
+    puts "<td><img class=bmp src=/img/generating.png pos=$v></td>"
+}
+puts "
+</tr></table>
+</div></td></tr>
 </table>
 <div id=buttons>
 <button id=save>Save Bookmarks</button>
@@ -46,4 +68,3 @@ var dir = '$dir';
 </div>
 <div id=results class=\"hidden blood\"></div>
 "
-

From 6937f2b7fb38a8f45c67bec58b29c63593363d81 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 10 Nov 2020 14:22:26 +0000
Subject: [PATCH 02/91] Add thumbnail viewer to Manage Bookmarks

---
 webif/html/browse/bookmarks/script.js | 66 ++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index 02174c7a..5a99e3c7 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -1,11 +1,17 @@
 var curval = 0;
 var $slider;
+var end = -1;
+ 
+function toTimeStr(tval) {
+	return new Date(null, null, null, null, null, tval)
+ 		.toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' '
+}
 
 function
 setvals()
 {
 	values = $.trim($('#bookmarks').val()).split(/ +/);
-	if (!values.length || values[0] == '')
+	if (values.length > 0 && values[0] != '')
 	{
 		refreshtimes();
 		return;
@@ -68,13 +74,12 @@ refreshtimes()
 	values = $.trim($('#bookmarks').val()).split(/ +/);
 	if (!values.length || values[0] == '')
 	{
-		$('#bookmarkstime').text(t);
-		return;
+		$.each(values, function(k, v) {
+			/* cast to "int" */
+			end = v|0;
+			t += toTimeStr(v);
+		});
 	}
-	$.each(values, function(k, v) {
-		t += new Date(null, null, null, null, null, v)
-		    .toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' ';
-	});
 	$('#bookmarkstime').text(t);
 }
 
@@ -90,6 +95,7 @@ $(function() {
 
 $('#bookmarks').val($('#bookmarks').attr('init'));
 draw_slider();
+$('#curbmk').html(toTimeStr(end));
 
 $('#addbmark').button({icons: {primary: "ui-icon-plus"}, text: false})
     .on('click', function() {
@@ -127,6 +133,52 @@ $('#update').button()
 	draw_slider();
 });
 
+$('#slider')
+	.on('slidechange', function(evt, ui) {
+		if (end != ui.value) {
+			end = ui.value;
+			$('#curbmk').html(toTimeStr(end));
+			$('#thumbs').hide();
+			$('#genthumbs')
+			.button('enable')
+			.button('option', 'icon', 'ui-icon-zoomin');
+		}
+	});
+$('#genthumbs').button( { icons: {primary: "ui-icon-zoomin"}, disabled: false } )
+	.on('click', function() {
+		var start;
+		var incr = -1;
+		var last;
+		$(this)
+			.button('disable')
+			.button('option', 'icon', 'ui-icon-refresh');
+		$('img.bmp').each(function(i) {
+			if (start === undefined) {
+				start = $(this).attr('pos')|0;
+			} else {
+				last = $(this).attr('pos')|0;
+			}
+			incr++;
+		});
+	incr = (last - start) / incr;
+
+	$.get('/browse/thumbnail/mkrange.jim',
+			{
+				'file': file,
+				's':    start+end,
+				'e':    last+end,
+				'i':    incr
+			}, function() {
+				$('#thumbs').show();
+				$('img.bmp').each(function(i) {
+					var pos = $(this).attr('pos')|0;
+					$(this).attr('src',
+						'/browse/thumbnail/fetch.jim?file=' +
+						encodeURIComponent(file) + '&pos=' + (end+pos).toFixed(1));
+					});
+				$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
+    		});
 
 });
 
+});

From 0b6f6fccb129a4860af6aabea342e0dbfdba22ca Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 10 Nov 2020 15:59:05 +0000
Subject: [PATCH 03/91] Add tooltips to slider handles

---
 webif/html/browse/bookmarks/script.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index 5a99e3c7..469b7ebb 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -1,6 +1,7 @@
 var curval = 0;
 var $slider;
 var end = -1;
+var values;
  
 function toTimeStr(tval) {
 	return new Date(null, null, null, null, null, tval)
@@ -10,6 +11,7 @@ function toTimeStr(tval) {
 function
 setvals()
 {
+	var nvalues;
 	values = $.trim($('#bookmarks').val()).split(/ +/);
 	if (values.length > 0 && values[0] != '')
 	{
@@ -26,6 +28,7 @@ setvals()
 	});
 	values = nvalues;
 	$('#bookmarks').val(values.join(' '));
+	values = $.trim($('#bookmarks').val()).split(/ +/);
 	sortmarks();
 	refreshtimes();
 }
@@ -38,7 +41,6 @@ draw_slider()
 	else
 		$slider = $('#slider');
 	setvals();
-	values = $.trim($('#bookmarks').val()).split(/ +/);
 	if (!values.length || values[0] == '')
 	{
 		$slider = null;
@@ -65,6 +67,7 @@ draw_slider()
 			setvals();
 		}
 	});
+	refreshtimes();
 };
 
 function
@@ -79,6 +82,10 @@ refreshtimes()
 			end = v|0;
 			t += toTimeStr(v);
 		});
+		/* using internal class from jQueryUI */
+		$('#slider .ui-slider-handle').each( function(i) {
+			$(this).attr('title', toTimeStr(values[i]));
+		});
 	}
 	$('#bookmarkstime').text(t);
 }

From c9d72990928f1c237b8c2bf0631644b9452e835e Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 10 Nov 2020 20:07:24 +0000
Subject: [PATCH 04/91] Add Crop shortcut button

---
 webif/html/browse/bookmarks/script.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index 469b7ebb..b90eec72 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -135,6 +135,12 @@ $('#back').button({icons: {primary: "ui-icon-arrowreturnthick-1-w"}})
 	window.location = '/go/browse?dir=' + encodeURIComponent(dir);
 });
 
+$('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
+    .on('click', function() {
+		window.location = 
+			window.location.href.replace('/bookmarks/?','/crop/crop.jim?');
+});
+
 $('#update').button()
     .on('click', function() {
 	draw_slider();

From 8e68fb10ada29f0dabcc54ebf1f21991db0bc95a Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 10 Nov 2020 20:10:47 +0000
Subject: [PATCH 05/91] Add Crop shortcut button

---
 webif/html/browse/bookmarks/index.jim | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index fae94b7f..06d3542c 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require ts.class pretty_size
+require ts.class system.class pretty_size
 
 jscss script.js style.css
 jqplugin touchpunch
@@ -64,7 +64,12 @@ puts "
 </table>
 <div id=buttons>
 <button id=save>Save Bookmarks</button>
-<button id=back>Back to Media Browser</button>
+<button id=back>Back to Media Browser</button>"
+if {[system pkginst nicesplice]} {
+    puts "
+<button id=crop>Go to Crop</button>"
+}
+puts "
 </div>
 <div id=results class=\"hidden blood\"></div>
 "

From 3c8ea907de07dd2b74c2590d14c866397dff7cd2 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 11 Nov 2020 16:45:44 +0000
Subject: [PATCH 06/91] Add thumbnail viewer to Manage Bookmarks

Refactor script to handle UI interaction between Bookmarks, Slider and Thumbnail generation.
---
 webif/html/browse/bookmarks/script.js | 138 ++++++++++++++++----------
 1 file changed, 87 insertions(+), 51 deletions(-)

diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index b90eec72..21d32e78 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -5,14 +5,20 @@ var values;
  
 function toTimeStr(tval) {
 	return new Date(null, null, null, null, null, tval)
- 		.toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' '
+ 		.toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' ';
+}
+
+function 
+valarray(valstr)
+{
+	return valstr.trim().split(/ +/);
 }
 
 function
 setvals()
 {
 	var nvalues;
-	values = $.trim($('#bookmarks').val()).split(/ +/);
+	values = valarray($('#bookmarks').val());
 	if (values.length > 0 && values[0] != '')
 	{
 		refreshtimes();
@@ -28,7 +34,7 @@ setvals()
 	});
 	values = nvalues;
 	$('#bookmarks').val(values.join(' '));
-	values = $.trim($('#bookmarks').val()).split(/ +/);
+	values = valarray($('#bookmarks').val());
 	sortmarks();
 	refreshtimes();
 }
@@ -63,26 +69,58 @@ draw_slider()
 			var marks = '';
 			for (var i = 0; i < ui.values.length; ++i)
 				marks += ui.values[i] + ' ';
-			$('#bookmarks').val($.trim(marks));
+			$('#bookmarks').val(marks.trim()));
 			setvals();
 		}
 	});
 	refreshtimes();
 };
 
+function
+regenthumbs(curbmkstr) {
+	$('#curbmk').html(curbmkstr);
+	$('#thumbs').hide();
+	$('#genthumbs')
+		.button('enable')
+		.button('option', 'icon', 'ui-icon-zoomin');
+}
+
+function 
+update_slider() {
+	setvals();
+		
+	/* slider values are strings */
+	var curvalstr = "" + curval;
+	if (!values.includes(curvalstr)) {
+		/* try to map current selected bmk to new bmk */
+		var ovalues = $slider.slider( "option", "values" );
+		var nn = ovalues.indexOf(curvalstr);
+		if (nn < 0) {
+			curval = 0;
+		} else {
+			if (nn >= values.length) nn = values.length - 1;
+			curval = nn >= 0? values[nn]: 0;
+		}
+		regenthumbs(toTimeStr(curval));
+	}
+	$('#slider .ui-slider-handle').each( function(i) {
+		if (i >= values.length) 
+			$(this).hide();
+		else
+			$(this).show();
+		});
+	$slider.slider( "option", "values", values );
+};
+
 function
 refreshtimes()
 {
 	var t = '';
-	values = $.trim($('#bookmarks').val()).split(/ +/);
 	if (!values.length || values[0] == '')
 	{
 		$.each(values, function(k, v) {
-			/* cast to "int" */
-			end = v|0;
 			t += toTimeStr(v);
 		});
-		/* using internal class from jQueryUI */
 		$('#slider .ui-slider-handle').each( function(i) {
 			$(this).attr('title', toTimeStr(values[i]));
 		});
@@ -93,46 +131,46 @@ refreshtimes()
 function
 sortmarks()
 {
-	var a = $.trim($('#bookmarks').val()).split(/ +/);
-	a.sort(function(a, b){return a-b});
-	$('#bookmarks').val(a.join(" "));
+	values.sort(function(a, b){return a-b});
+	$('#bookmarks').val(values.join(" "));
 }
 
 $(function() {
 
 $('#bookmarks').val($('#bookmarks').attr('init'));
 draw_slider();
-$('#curbmk').html(toTimeStr(end));
+$('#curbmk').html(toTimeStr(curval));
 
 $('#addbmark').button({icons: {primary: "ui-icon-plus"}, text: false})
     .on('click', function() {
-	$('#bookmarks').val('0 ' + $('#bookmarks').val());
-	draw_slider();
+		$('#bookmarks').val('0 ' + $('#bookmarks').val());
+		curval = 0;
+		update_slider();
 });
 
 $('#delbmark').button({icons: {primary: "ui-icon-minus"}, text: false})
     .on('click', function() {
-	var cur = $('#bookmarks').val();
-	cur = $.trim(cur.replace(
-	    new RegExp('(^| )' + curval + '( |$)', ''), ' '));
-	$('#bookmarks').val(cur);
-	draw_slider();
+		var cur = $('#bookmarks').val();
+		cur = cur.replace(
+			new RegExp('(^| )' + curval + '( |$)', ''), ' ').trim();
+		$('#bookmarks').val(cur);
+		update_slider();
 });
 
 $('#save').button({icons: {primary: "ui-icon-disk"}})
     .on('click', function() {
-	$.post('save.jim', {
-		file: file,
-		bookmarks: $('#bookmarks').val()
-	}, function(data) {
-		$('#results').html(data)
-		    .slideDown('slow').delay(5000).slideUp('slow');
-	});
+		$.post('save.jim', {
+			file: file,
+			bookmarks: $('#bookmarks').val()
+		}, function(data) {
+			$('#results').html(data)
+				.slideDown('slow').delay(5000).slideUp('slow');
+		});
 });
 
 $('#back').button({icons: {primary: "ui-icon-arrowreturnthick-1-w"}})
     .on('click', function() {
-	window.location = '/go/browse?dir=' + encodeURIComponent(dir);
+		window.location = '/go/browse?dir=' + encodeURIComponent(dir);
 });
 
 $('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
@@ -143,20 +181,17 @@ $('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
 
 $('#update').button()
     .on('click', function() {
-	draw_slider();
+		update_slider();
 });
 
 $('#slider')
 	.on('slidechange', function(evt, ui) {
-		if (end != ui.value) {
-			end = ui.value;
-			$('#curbmk').html(toTimeStr(end));
-			$('#thumbs').hide();
-			$('#genthumbs')
-			.button('enable')
-			.button('option', 'icon', 'ui-icon-zoomin');
+		var tstr = toTimeStr(curval);
+		if (tstr != $('#curbmk').html()) {
+			regenthumbs(tstr);
 		}
-	});
+});
+
 $('#genthumbs').button( { icons: {primary: "ui-icon-zoomin"}, disabled: false } )
 	.on('click', function() {
 		var start;
@@ -176,21 +211,22 @@ $('#genthumbs').button( { icons: {primary: "ui-icon-zoomin"}, disabled: false }
 	incr = (last - start) / incr;
 
 	$.get('/browse/thumbnail/mkrange.jim',
-			{
-				'file': file,
-				's':    start+end,
-				'e':    last+end,
-				'i':    incr
-			}, function() {
-				$('#thumbs').show();
-				$('img.bmp').each(function(i) {
-					var pos = $(this).attr('pos')|0;
-					$(this).attr('src',
-						'/browse/thumbnail/fetch.jim?file=' +
-						encodeURIComponent(file) + '&pos=' + (end+pos).toFixed(1));
-					});
-				$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
-    		});
+		{
+			'file': file,
+			's':    start+end,
+			'e':    last+end,
+			'i':    incr
+		}, function() {
+			$('#thumbs').show();
+			$('img.bmp').each(function(i) {
+				/* cast to "int" */
+				var pos = $(this).attr('pos')|0;
+				$(this).attr('src',
+					'/browse/thumbnail/fetch.jim?file=' +
+					encodeURIComponent(file) + '&pos=' + (curval+pos).toFixed(1));
+				});
+			$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
+		});
 
 });
 

From 580ecb8c75d5f756836156372493ed41a03ef9e0 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 11 Nov 2020 16:48:46 +0000
Subject: [PATCH 07/91] Add thumbnail viewer to Manage Bookmarks

Finally eliminate end in favour of curval
---
 webif/html/browse/bookmarks/script.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index 21d32e78..f5da93c4 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -1,6 +1,5 @@
 var curval = 0;
 var $slider;
-var end = -1;
 var values;
  
 function toTimeStr(tval) {
@@ -213,8 +212,8 @@ $('#genthumbs').button( { icons: {primary: "ui-icon-zoomin"}, disabled: false }
 	$.get('/browse/thumbnail/mkrange.jim',
 		{
 			'file': file,
-			's':    start+end,
-			'e':    last+end,
+			's':    start+curval,
+			'e':    last+curval,
 			'i':    incr
 		}, function() {
 			$('#thumbs').show();

From 20c035873e03fcdcb67f2dee21568b2fa50b00eb Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 12 Feb 2021 14:28:05 +0000
Subject: [PATCH 08/91] Remove invalid use of video/ts MIME type

---
 webif/html/browse/download.jim | 2 +-
 webif/lib/system.class         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/webif/html/browse/download.jim b/webif/html/browse/download.jim
index 41447e78..dcf113f8 100755
--- a/webif/html/browse/download.jim
+++ b/webif/html/browse/download.jim
@@ -10,7 +10,7 @@ set urlbase [cgi_get base ""]
 
 # Default to just downloading the raw file.
 set url $file
-set mime "video/ts"
+set mime "video/mp2t"
 
 if {[string match {*.ts} $file]} {
 	if {![catch {set ts [ts fetch $file]}]} {
diff --git a/webif/lib/system.class b/webif/lib/system.class
index e0ffb9aa..6d1fe5c4 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -269,7 +269,7 @@ proc {system dlnadb} {} {
 }
 
 proc {system _dlnaurl} {file urlbase} {
-	set mime "video/ts"
+	set mime "video/mp2t"
 	if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
 		return {}
 	}
@@ -278,7 +278,10 @@ proc {system _dlnaurl} {file urlbase} {
 	    from tblresource join tblmedia using (mediaid)
 	    where localurl = '%s'} $file]
 	if {[llength $muri]} {
-		lassign [lindex $muri 0] x mime x xuri
+		lassign [lindex $muri 0] x maybemime x xuri
+		if {$maybemime ne "video/ts"} {
+			set mime $maybemime
+		}
 	} else {
 		# Try for partially linked entry
 		set muri [$db query {

From 75b32ad3e091671a5be7ff3b23868a170dd40ca3 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 15 Mar 2021 15:50:30 +0000
Subject: [PATCH 09/91] Make 127.0.0.1 the default host for DLNA functions (pt
 2)

---
 webif/lib/system.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/lib/system.class b/webif/lib/system.class
index 6d1fe5c4..a740e983 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -300,7 +300,7 @@ proc {system _dlnaurl} {file urlbase} {
 	return [list $url $mime]
 }
 
-proc {system dlnaurl} {file {urlbase ""}} {
+proc {system dlnaurl} {file {urlbase "127.0.0.1"}} {
 	if {$urlbase eq ""} { set urlbase [system ip] }
 	set retries 5
 	set ret {}

From 3454302a98a697bab97edac6ce0f4d9c161f6554 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 16 Feb 2021 00:28:24 +0000
Subject: [PATCH 10/91] Use dicts for `httpheader`

---
 webif/lib/setup | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/webif/lib/setup b/webif/lib/setup
index 82f17a04..4ae354b3 100644
--- a/webif/lib/setup
+++ b/webif/lib/setup
@@ -33,16 +33,24 @@ if {![exists -proc require]} {
 		exit
 	}
 
-	proc httpheader {{type "text/html"} {cache 0} {extra ""}} {{done 0}} {
+	proc httpheader {{type "text/html"} {cache 0} {extra {}}} {{done 0}} {
 		if {$done} return
 		if {!$cache} {
-			puts -nonewline "Content-Type: $type; charset=\"UTF-8\"; no-cache\r\n"
-			puts -nonewline "Expires: -1\r\n"
-			puts -nonewline "Connection: close\r\n"
-			puts -nonewline "Pragma: no-cache\r\n"
-			puts -nonewline "Cache-Control: no-cache\r\n"
+			set hdr [dict create \
+				"Content-Type" "$type; charset=\"UTF-8\"; no-cache" \
+				"Expires" "-1" \
+				"Connection" "close" \
+				"Pragma" "no-cache" \
+				"Cache-Control" "no-cache"]
 		} else {
-			puts -nonewline "Content-Type: $type; charset=\"UTF-8\"\r\n"
+			set hdr [dict create "Content-Type" "$type; charset=\"UTF-8\""]
+		}
+		if {![catch {dict size $extra}]} {
+			set hdr [dict merge $hdr $extra]
+			set extra ""
+		}
+		dict for {k v} $hdr {
+			puts -nonewline "$k: $v\r\n"
 		}
 		if {$extra ne ""} { puts -nonewline "$extra" }
 		puts -nonewline "\r\n"

From 68d9d7f5b5229a308396e3c7f2ef26568ae30ead Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 16 Feb 2021 01:01:25 +0000
Subject: [PATCH 11/91] Add webm to displayed file types

Also handle files with no "definition" as not ts.
---
 webif/html/browse/index.jim | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index be17858b..8e6f27c7 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -21,7 +21,7 @@ header
 set nicesplice [system pkginst nicesplice]
 
 set ignore {.nts .thm .hmi}
-set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt .m4v .m4a}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt .m4v .m4a .webm}
 
 if {![dict exists $env SCRIPT_NAME]} {
 	set env(SCRIPT_NAME) ""
@@ -139,6 +139,14 @@ proc entry {file} {{i 0}} {
 			set img Video_Failed
 		}
 		set omenu opt
+		if {[$ts get definition] eq ""} {
+	        set type gen
+	        set ts 0
+			set img Video_Other                                    
+			set omenu oopt
+		} else {
+			set omenu opt
+		}
 		if {[file exists "${base}.thm"]} { set thmok 1 }
 	} elseif {$ext eq ".hmt"} {
 		if {[file exists "${base}.ts"]} { return }

From e79e85af816f621837c2e528235f42ca8236899e Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 15 Mar 2021 13:25:44 +0000
Subject: [PATCH 12/91] Make {system dlnaurl} handle any valid pathname for a
 file

---
 webif/html/browse/index.jim | 4 ++--
 webif/lib/system.class      | 4 ++++
 webif/lib/ts.class          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 8e6f27c7..587f67eb 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -215,8 +215,8 @@ proc entry {file} {{i 0}} {
 
 	# Indexed
 	set dlna 0
-	if {$::dlnaok && $::model eq "HDR" && [llength [
-	    system dlnaurl [file normalize $file]]]} {
+	if {$::dlnaok && $::model eq "HDR" && 
+		[llength [system dlnaurl $file]]} {
 		icon "/img/dlna.png" "Indexed by DLNA Server"
 		set dlna 1
 	}
diff --git a/webif/lib/system.class b/webif/lib/system.class
index a740e983..db3ce76e 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -270,6 +270,10 @@ proc {system dlnadb} {} {
 
 proc {system _dlnaurl} {file urlbase} {
 	set mime "video/mp2t"
+	set nfile $file
+	if {![catch {set nfile [file normalize $file]}]} {
+		set file $nfile
+	}
 	if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
 		return {}
 	}
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 6eb0b518..d4de7ff1 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -331,7 +331,7 @@ ts method setgenre {newgenre} {
 }
 
 ts method dlnaloc {{urlbase ""}} {
-	return [system dlnaurl [file normalize $file] $urlbase]
+	return [system dlnaurl $file $urlbase]
 }
 
 ts method cleanbmp {} {

From f032f8b4696295e786fb066011a94d40a5894a21 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 16 Feb 2021 00:49:28 +0000
Subject: [PATCH 13/91] Play file in browser or with external helper
 application

Create a new `play.jim` in html/browse. The `/play` subtree is now obsolete and can be removed.

Fix DLNA playback on HDR

`urlbase` is the host name

Remove typos (missing }s, $)

Make new file 'play.jim' executable
---
 webif/html/browse/file.jim  | 44 ++++++++++++++++----------
 webif/html/browse/play.jim  | 62 ++++++++++++++++++++++++++++++++++++
 webif/html/browse/script.js | 63 +++++++++++++++++++++++++++----------
 3 files changed, 136 insertions(+), 33 deletions(-)
 create mode 100755 webif/html/browse/play.jim

diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim
index e35e86dd..04c227cd 100755
--- a/webif/html/browse/file.jim
+++ b/webif/html/browse/file.jim
@@ -13,10 +13,14 @@ if {$file == 0} exit
 
 set sz [pretty_size [file size $file]]
 
+set flags {}
+set url ""
+
+# assumption: the type is only ts if fetch has already been checked
 if {$type eq "ts"} {
 	require epg.class ts.class
 
-	set ts [ts fetch $file]
+	set ts [ts fetch $file 1]
 
 	# Causes other series information to be automatically populated
 	set epname [$ts episode_name]
@@ -199,7 +203,7 @@ eval_plugins browsetsfile
 
 puts "<tr>
 	<th>Flags</th>
-	<td>[$ts get flags]</td>
+	<td>[set flags [$ts get flags]]</td>
       </tr>
 "
 
@@ -215,9 +219,6 @@ if {[$ts get bookmarks]} {
 		"
 }
 
-puts "
-	</table>
-"
 puts "<div class=hidden id=file>$file</div>"
 puts {
 <script type=text/javascript>
@@ -256,12 +257,12 @@ $('img.rollimg').hover(
 
 </script>
 }
-	exit
 }
 
 # Otherwise, for a general file.
 
-puts "
+if {$type ne "ts"} {
+	puts "
 <table class=keyval>
 <tr>
 	<th>File</th>
@@ -269,20 +270,29 @@ puts "
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>
-</tr><tr>
+</tr>"
+}
+
+set hasffmpeg 0
+if {$type ne "ts" || ("ODEncrypted" ni $flags && $url eq "") } {
+	puts "<tr>
 	<th>Info</th>
 	<td class=pre id=ffmpeg>
 		<img src=/img/spin.gif><i>Loading...</i>
 	</td>
-</tr>
-</table>
-"
+</tr>"
+	set hasffmpeg 1
+}
+puts "
+	</table>
+	"
 
-set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
-puts { <script type="text/javascript"> }
-puts "var url = \"$url\";"
-puts {
-	$('#ffmpeg').load(url);
+if {$hasffmpeg} {
+	set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
+	puts { <script type="text/javascript"> }
+	puts "var url = \"$url\";"
+	puts {
+	$('#ffmpeg').load(url, function() { $('#play').button('enable'); });
 </script>
 }
-
+}
diff --git a/webif/html/browse/play.jim b/webif/html/browse/play.jim
new file mode 100755
index 00000000..3eb8dc37
--- /dev/null
+++ b/webif/html/browse/play.jim
@@ -0,0 +1,62 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require system.class
+require ts.class
+
+set file [cgi_get file]
+set urlbase [cgi_get base ""]
+set duration [cgi_get duration 1]
+set fmts [split [cgi_get fmts ""] ","]
+set vc [cgi_get vc ""]
+
+# Default to just downloading the raw file.
+set url $file
+
+# Prefer to use DLNA server ... (necessary if encrypted)
+set dlna [system dlnaurl $url $urlbase]
+if {[llength $dlna]} { 
+	set url [lindex $dlna 0]
+} elseif {[regexp {^(https?://(.+:.*@)?[[:alnum:].]+(:[[:digit:]]+)?)/} $urlbase x y]} {
+	set url "$y$url"
+} else {
+	set url "http://[system ip]$url"
+}
+ 
+if {[file extension $file] in {.ts .TS}} {
+	if {![catch {set ts [ts fetch $file]}] && $ts != 0} {
+		set duration [$ts duration 1]
+	}
+}
+
+set file [file tail $file] 
+set playlist [file tempfile "[env "TMPDIR" [env "TMP" "/tmp"]]/playXXXXXX"]
+set pl ""
+try {
+	set pl [open $playlist w]
+	$pl puts "#EXTM3U"
+	$pl puts "#EXTINF:$duration,$file"
+	$pl puts "#PLAYLIST:$file" 
+	$pl puts $url
+} finally {
+	if {$pl ne ""} {
+		$pl close
+	}
+}
+
+httpheader "application/x-mpegurl" 0 [list \
+	"Content-Disposition" "attachment; filename=\"[file rootname $file].m3u\"" \
+  	"Content-Length" "[file size $playlist]" \
+  	]
+set pl ""
+try {
+	set pl [open $playlist r]
+	$pl copyto stdout
+} finally {                                                                  
+        if {$pl ne ""} {                                                         
+               $pl close
+        }
+}
+catch {file delete $playlist}
+
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 5269fa00..2ed094f9 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -787,12 +787,14 @@ $('img.doopt').contextMenu(
 // Disable items which are not yet implemented.
 $('#optmenu').disableContextMenuItems('#title');
 
-var $buttons = {
-    "Close" : function() {$(this).dialog('close');}
-};
-var $buttonsp = $.extend(
-    {"Play" : function() { doplay(); }},
-    $buttons);
+var $buttons = [
+		{ id: 'close',
+		text: 'Close',
+		click: function() {$(this).dialog('close');}},
+		{ id: 'play',
+		text: 'Play',
+		click: function() { doplay(this); }}
+];
 
 // Create reusable dialogue.
 var $dialog = $('#dialogue').dialog({
@@ -806,16 +808,47 @@ var $dialog = $('#dialogue').dialog({
 	    '<img src="/img/spin.gif">Retrieving data...'); }
 });
 
-function doplay()
+function doplay(it)
 {
 	var file = $dialog.attr('file');
 	var type = $dialog.attr('type');
 
-	disableall();
+ 	var duration = 0;
+ 	var fmts = "";
+ 	var vc = ""
+ 	var ff = $('#ffmpeg')[0];
+     
+ 	if (ff) {
+		/* extract duration, container and video codec from ffmpeg output */
+		ff = ff.innerHTML;
+		var match = /Duration:\s+([0-9.:]+),/.exec(ff);
+		if (match && match[1])
+			duration = (new Date('1970-01-01T' + match[1] + 'Z')).getTime()/1000;
+		match = /Input #0,\s+([-A-Za-z0-9_,]+),\s/.exec(ff);
+		if (match && match[1]) fmts = match[1];
+		match = /Stream #.+\sVideo:\s+([-A-Za-z0-9_]+)\s/.exec(ff);
+		if (match && match[1]) vc = match[1];
+	}
 
-	window.location = '/play/play.jim?' +
-	    'dir=' + encodeURIComponent(dir) +
-	    '&file=' + encodeURIComponent(file);
+	fmts = /mp4|webm/.exec(fmts);
+ 	if (fmts && fmts[0]) 
+		vc = /h264|av1|vp9/.exec(vc);
+	else
+		vc = null;
+	
+	if (vc && vc[0]) {
+		/* base on page address to handle client on external network, etc */
+		var hh = new URL(file, window.location.href);
+		window.location = hh.href;
+	} else {
+		window.location = '/browse/play.jim?' +
+			'dir=' + encodeURIComponent(dir) +
+			'&base=' + encodeURI(window.location.hostname) +
+			'&duration=' + duration +
+			'&file=' + encodeURIComponent(file);
+	}
+	
+	$(it).dialog('close');
 }
 
 // Bind dialogue open to filenames.
@@ -834,11 +867,9 @@ $('a.bf').click(function(e) {
 	$dialog.attr('file', file);
 	$dialog.attr('type', type);
 
-	if (type == 'ts' &&
-	    (opt.attr('odencd') == 0 || opt.attr('dlna') == 1))
-		$dialog.dialog("option", "buttons", $buttonsp);
-	else
-		$dialog.dialog("option", "buttons", $buttons);
+	if (!(type == 'ts' &&
+	    (opt.attr('odencd') == 0 || opt.attr('dlna') == 1)))
+		$('#play').button('disable');
 	$dialog.dialog('open');
 });
 

From 7964145677c638f2dd161b0e5440a267ec2c1b36 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 15 Mar 2021 16:37:13 +0000
Subject: [PATCH 14/91] Don't play HTML5 media in the WebIf Browse Files window

---
 webif/html/browse/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 2ed094f9..be4a9bf1 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -839,7 +839,7 @@ function doplay(it)
 	if (vc && vc[0]) {
 		/* base on page address to handle client on external network, etc */
 		var hh = new URL(file, window.location.href);
-		window.location = hh.href;
+		window.open(hh.href, 'WebIf_Player');
 	} else {
 		window.location = '/browse/play.jim?' +
 			'dir=' + encodeURIComponent(dir) +

From 4845a4b0cfe78ca762ed69105185101f4fb122be Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 13 Apr 2021 12:58:20 +0000
Subject: [PATCH 15/91] Add Download button

---
 webif/html/browse/file.jim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim
index 04c227cd..66752481 100755
--- a/webif/html/browse/file.jim
+++ b/webif/html/browse/file.jim
@@ -282,6 +282,10 @@ if {$type ne "ts" || ("ODEncrypted" ni $flags && $url eq "") } {
 	</td>
 </tr>"
 	set hasffmpeg 1
+} elseif {$type eq "ts" && $url ne ""} {
+	puts { <script type="text/javascript"> }
+	puts "$('#playDL').attr('href','$url').enable();
+	puts { </script> }
 }
 puts "
 	</table>
@@ -292,7 +296,7 @@ if {$hasffmpeg} {
 	puts { <script type="text/javascript"> }
 	puts "var url = \"$url\";"
 	puts {
-	$('#ffmpeg').load(url, function() { $('#play').button('enable'); });
+	$('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); });
 </script>
 }
 }

From c8f51adfaacde53f5477f7ce533e0daaeab58acb Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 16 Apr 2021 10:29:27 +0000
Subject: [PATCH 16/91] Add Download button

---
 webif/html/browse/script.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index be4a9bf1..daf00756 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -10,7 +10,7 @@ var plugins = {
 	dmenu_prepare: {}
 };
 
-// pattern matches directory path prefix
+// pattern matches directory path prefix and suffix
 var pathre = /.*\/|\.[^.]*$/g;
 
 // IDs of size, img elements for folders use RFC4648 s5 encoding of name
@@ -808,6 +808,15 @@ var $dialog = $('#dialogue').dialog({
 	    '<img src="/img/spin.gif">Retrieving data...'); }
 });
 
+/* insert button-like Download link before Play */
+$('#play').before(function(i){                               
+	var dl = document.createElement('a');                
+	dl.setAttribute('class', this.className);            
+	dl.id = this.id + 'DL';                              
+	dl.innerHTML = 'Download';                           
+	return dl;                                           
+});                                                          
+
 function doplay(it)
 {
 	var file = $dialog.attr('file');
@@ -864,12 +873,18 @@ $('a.bf').click(function(e) {
 		type: type
 	});
 
-	$dialog.attr('file', file);
-	$dialog.attr('type', type);
+	if (type == 'ts') {
+		if (opt.attr('odencd') != 0) {
+			/* encrypted: link to be enabled once populated */
+			$('#playDL').disable();
+			/* ... but if no DLNA never Play */
+			if (opt.attr('dlna') != 1) $('#play').disable();
+		}
+	} else {
+		/* generic: enable Play once media file is parsed */
+		$('#play').disable();
+	}                                      
 
-	if (!(type == 'ts' &&
-	    (opt.attr('odencd') == 0 || opt.attr('dlna') == 1)))
-		$('#play').button('disable');
 	$dialog.dialog('open');
 });
 

From 8bbc28d3c259892defe6bf7a2986f647cf4a2882 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 16 Apr 2021 10:32:20 +0000
Subject: [PATCH 17/91] Add Download button

---
 webif/html/browse/style.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/webif/html/browse/style.css b/webif/html/browse/style.css
index d2e2fa38..93e63e4c 100644
--- a/webif/html/browse/style.css
+++ b/webif/html/browse/style.css
@@ -35,3 +35,13 @@ input.uint8_t
 	width: 6ch;
 }
 
+/* a link that looks like a button */
+button + a.ui-button
+{
+	margin-right: 0.4em;
+}
+.ui-button:link
+{
+	background-color: rgb(254, 206, 47) !important;
+}
+

From 243dfdd59542f548f06ec4f2faedfd123adbe083 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 17 Apr 2021 01:55:33 +0000
Subject: [PATCH 18/91] Fix quoting and escaping of JS fragments

NB jQuery $('#id') in a string looks like an [expr ...] to Jim!
---
 webif/html/browse/file.jim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim
index 66752481..9ef4f5c8 100755
--- a/webif/html/browse/file.jim
+++ b/webif/html/browse/file.jim
@@ -283,9 +283,10 @@ if {$type ne "ts" || ("ODEncrypted" ni $flags && $url eq "") } {
 </tr>"
 	set hasffmpeg 1
 } elseif {$type eq "ts" && $url ne ""} {
-	puts { <script type="text/javascript"> }
-	puts "$('#playDL').attr('href','$url').enable();
-	puts { </script> }
+	puts [format { 
+		<script type="text/javascript"> 
+		$('#playDL').attr('href','%s').enable();
+		</script> } $url]
 }
 puts "
 	</table>
@@ -293,10 +294,9 @@ puts "
 
 if {$hasffmpeg} {
 	set url "/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
-	puts { <script type="text/javascript"> }
-	puts "var url = \"$url\";"
-	puts {
-	$('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); });
-</script>
-}
+	puts [format { 
+		<script type="text/javascript"> 
+		var url = "%s";
+		$('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); }); }
+		</script> } $url]
 }

From 8b795a0a7d845b4fabffb28b88acd62e7cea7d25 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 17 Apr 2021 12:09:25 +0000
Subject: [PATCH 19/91] Fix quoting and escaping of JS fragments

---
 webif/html/browse/file.jim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim
index 9ef4f5c8..17527bf2 100755
--- a/webif/html/browse/file.jim
+++ b/webif/html/browse/file.jim
@@ -297,6 +297,6 @@ if {$hasffmpeg} {
 	puts [format { 
 		<script type="text/javascript"> 
 		var url = "%s";
-		$('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); }); }
+		$('#ffmpeg').load(url, function() { $('#play, #playDL').enable(); });
 		</script> } $url]
 }

From bf838ed5e4a19f16d9e97ac7238e5e40718121a8 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 17 Apr 2021 13:42:50 +0000
Subject: [PATCH 20/91] Add Download button

---
 webif/html/browse/script.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index daf00756..765afb7d 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -873,16 +873,22 @@ $('a.bf').click(function(e) {
 		type: type
 	});
 
+	$('#playDL').attr('download', file.replace(/.*\//, ''));
+
 	if (type == 'ts') {
 		if (opt.attr('odencd') != 0) {
 			/* encrypted: link to be enabled once populated */
 			$('#playDL').disable();
 			/* ... but if no DLNA never Play */
 			if (opt.attr('dlna') != 1) $('#play').disable();
+		} else {
+			/* link unencrypted file directly */
+			$('#playDL').attr('href', file);
 		}
 	} else {
 		/* generic: enable Play once media file is parsed */
 		$('#play').disable();
+		$('#playDL').attr('href', file);
 	}                                      
 
 	$dialog.dialog('open');

From da7d07a891b030c93abf230a58fd70ade2b1f682 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 17 Apr 2021 14:13:04 +0000
Subject: [PATCH 21/91] Add Download button

---
 webif/html/browse/script.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 765afb7d..11bb2cde 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -873,6 +873,9 @@ $('a.bf').click(function(e) {
 		type: type
 	});
 
+	$dialog.attr('file', file);
+	$dialog.attr('type', type);
+
 	$('#playDL').attr('download', file.replace(/.*\//, ''));
 
 	if (type == 'ts') {

From 49a7e430cf6df5c2a2b908bc220aa5c91da1952f Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 19 May 2021 13:06:28 +0100
Subject: [PATCH 22/91] Fix incorrectly constructed query list to restore
 purging completed entries A constant list included an item that needed to be
 evaluated.

---
 webif/lib/queue.class | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webif/lib/queue.class b/webif/lib/queue.class
index 59715a02..1a178000 100644
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -146,7 +146,7 @@ proc {queue dbqueryl} {query_list {txn_mode ""}} {
 
 proc {queue startup} {{days 7}} {
 	if {$days == 0} { set days 7 }
-	return [queue dbqueryl { { {
+	return [queue dbqueryl [list { {
 		update queue
 		set status = 'INTERRUPTED',
 		log = 'Job will be retried automatically.',
@@ -163,12 +163,12 @@ proc {queue startup} {{days 7}} {
 		update queue
 		set status = 'PENDING'
 		where status = 'DEFER'
-	} } { {
+	} } [list {
 		delete from queue
 		where status in ('COMPLETE', 'FAILED')
 		and submitted < %s
 	} [expr [clock seconds] - 86400 * $days]
-	} } ]
+	] ] ]
 }
 
 proc {queue fetch} {file action} {

From 519f771859cc77074d41cf77c3ac0d47167fed2f Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Sat, 14 Nov 2020 01:17:07 +0000
Subject: [PATCH 23/91] Fix thumbnail generation

---
 webif/lib/ts.class | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 34087cf2..de181780 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -354,13 +354,14 @@ ts method mkbmps {{offset 0}} {
 
 ts method mkbmp {{offset 0} {ext ""}} {
 	set bfile [file rootname $file]
-	set cmd [list /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
-	    -frames 1 -pix_fmt argb -vf vflip -s 140x78 "$bfile$ext.bmp"]
-	if {[catch { exec {*}$cmd } msg]} {
-		puts "ERROR: $msg"
-		return 0
-	}
-	return 1
+    set bmpfile "$bfile$ext.bmp"
+    set cmd [list /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
+        -frames 1 -pix_fmt argb -vf vflip -s 140x78 -y $bmpfile]
+    catch { exec {*}$cmd }
+    if {![catch { file stat $bmpfile stbmp }]} {
+            if {[dict get $stbmp size] != 0} { return 1 }
+    }
+    return 0
 }
 
 ts method mkthm {{offset 0}} {

From 1b11be6827952d5ff42f146031352fdfb68f6a7d Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Sat, 14 Nov 2020 01:25:46 +0000
Subject: [PATCH 24/91] Fix the ****ing formatting in this stupid editor

---
 webif/lib/ts.class | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index de181780..b998d93f 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -354,14 +354,14 @@ ts method mkbmps {{offset 0}} {
 
 ts method mkbmp {{offset 0} {ext ""}} {
 	set bfile [file rootname $file]
-    set bmpfile "$bfile$ext.bmp"
-    set cmd [list /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
-        -frames 1 -pix_fmt argb -vf vflip -s 140x78 -y $bmpfile]
-    catch { exec {*}$cmd }
-    if {![catch { file stat $bmpfile stbmp }]} {
-            if {[dict get $stbmp size] != 0} { return 1 }
-    }
-    return 0
+	set bmpfile "$bfile$ext.bmp"
+	set cmd [list /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
+	    -frames 1 -pix_fmt argb -vf vflip -s 140x78 -y $bmpfile]
+	catch { exec {*}$cmd }
+	if {![catch { file stat $bmpfile stbmp }]} {
+		if {[dict get $stbmp size] != 0} { return 1 }
+	}
+	return 0
 }
 
 ts method mkthm {{offset 0}} {

From 567d1426133f1d864eb909e92c16547245924df7 Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Mon, 19 Oct 2020 16:05:12 +0000
Subject: [PATCH 25/91] Prevent raw utf8 display

https://hummy.tv/forum/threads/webif-web-interface-1-4-x.7712/post-135917
---
 webif/html/browse/rename.jim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webif/html/browse/rename.jim b/webif/html/browse/rename.jim
index 618f46bf..1e3a07ae 100755
--- a/webif/html/browse/rename.jim
+++ b/webif/html/browse/rename.jim
@@ -26,6 +26,9 @@ if {[file isdirectory $file]} {
 			set new [string map {"\n" ""} [
 			    string trim [cgi_get "rename_$attr"]]]
 			set old [$ts get $attr]
+			if {$attr eq "title" || $attr eq "synopsis"} {
+				set new "\025$new"
+			}
 			if {$new ne $old} {
 				if {$attr eq "guidance" ||
 				    [string length $new] > 0} {

From 67e71691eb4ad5346e8aef0abe67824de323e7ea Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sun, 18 Oct 2020 14:53:23 +0000
Subject: [PATCH 26/91] Retry access in case the settings database is locked

Create `settings::_safer_query` class proc to allow 5 tries with 1s delay; use it for `_nval_setting` and `_tval_setting` methods
---
 webif/lib/settings.class | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index 05361dd5..4251fa6f 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -54,6 +54,21 @@ class settings {
 	rtschedule	0
 }
 
+proc {settings _safer_query} { queryText args } {
+	global settingsdb
+	# allow 5 (too many?) tries with 1s (too long?) delay to get access
+	for {set lockCnt 5} {} {sleep 1} {
+		try {
+			$settingsdb query $queryText {*}$args
+		} on error {msg opts} {
+			if {[string first "database is locked" $msg] >= 0 && [incr lockCnt -1] > 0} {
+				continue
+			}
+			return {*}$opts $msg
+		}
+	}
+}
+
 settings method hostname {{name ""}} {
 	if {$name == ""} {
 		# Get
@@ -104,11 +119,10 @@ settings method smtp_server {{server ""}} {
 }
 
 settings method _nval_setting {name {val -1}} {
-	global settingsdb
 
 	if {$val == -1} {
 		# Get
-		set res [$settingsdb query "
+		set res [settings::_safer_query "
 			select nval from settings
 			where name = '$name'
 		"]
@@ -118,7 +132,7 @@ settings method _nval_setting {name {val -1}} {
 		return 0
 	} else {
 		# Set
-		$settingsdb query "
+		settings::_safer_query "
 			replace into settings(name,nval)
 			values('$name', $val)
 		"
@@ -127,11 +141,10 @@ settings method _nval_setting {name {val -1}} {
 }
 
 settings method _tval_setting {name {val -1} {def 0}} {
-	global settingsdb
 
 	if {$val eq "-1"} {
 		# Get
-		set res [$settingsdb query "
+		set res [settings::_safer_query "
 			select tval from settings
 			where name = '$name'
 		"]
@@ -141,7 +154,7 @@ settings method _tval_setting {name {val -1} {def 0}} {
 		return $def
 	} else {
 		# Set
-		$settingsdb query "
+		settings::_safer_query "
 			replace into settings(name,tval)
 			values('$name', '%s')
 		" $val

From 3981bbd37e1fa3f18c1b09e17cb74e1884d80f05 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sun, 18 Oct 2020 15:48:07 +0000
Subject: [PATCH 27/91] Retry access in case the settings database is locked

---
 webif/lib/settings.class | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index 4251fa6f..5b561850 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -56,10 +56,11 @@ class settings {
 
 proc {settings _safer_query} { queryText args } {
 	global settingsdb
+
 	# allow 5 (too many?) tries with 1s (too long?) delay to get access
-	for {set lockCnt 5} {} {sleep 1} {
+	for {set lockCnt 5} {true} {sleep 1} {
 		try {
-			$settingsdb query $queryText {*}$args
+			return [$settingsdb query $queryText {*}$arg]
 		} on error {msg opts} {
 			if {[string first "database is locked" $msg] >= 0 && [incr lockCnt -1] > 0} {
 				continue
@@ -122,7 +123,7 @@ settings method _nval_setting {name {val -1}} {
 
 	if {$val == -1} {
 		# Get
-		set res [settings::_safer_query "
+		set res [settings _safer_query "
 			select nval from settings
 			where name = '$name'
 		"]
@@ -132,7 +133,7 @@ settings method _nval_setting {name {val -1}} {
 		return 0
 	} else {
 		# Set
-		settings::_safer_query "
+		settings _safer_query "
 			replace into settings(name,nval)
 			values('$name', $val)
 		"
@@ -144,7 +145,7 @@ settings method _tval_setting {name {val -1} {def 0}} {
 
 	if {$val eq "-1"} {
 		# Get
-		set res [settings::_safer_query "
+		set res [settings _safer_query "
 			select tval from settings
 			where name = '$name'
 		"]
@@ -154,7 +155,7 @@ settings method _tval_setting {name {val -1} {def 0}} {
 		return $def
 	} else {
 		# Set
-		settings::_safer_query "
+		settings _safer_query "
 			replace into settings(name,tval)
 			values('$name', '%s')
 		" $val

From 13f3b1cccebd6ceeec0ce7f1794201f8d0e31d1c Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sun, 18 Oct 2020 19:19:26 +0000
Subject: [PATCH 28/91] Raise the "database locked" error from caller context

---
 webif/lib/settings.class | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index 5b561850..fa74b117 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -62,8 +62,14 @@ proc {settings _safer_query} { queryText args } {
 		try {
 			return [$settingsdb query $queryText {*}$arg]
 		} on error {msg opts} {
-			if {[string first "database is locked" $msg] >= 0 && [incr lockCnt -1] > 0} {
-				continue
+			if {[string first "database is locked" $msg] >= 0} {
+				if {[incr lockCnt -1] > 0} {
+					continue
+				} else {
+					# raise error from caller
+					set msg "Persistently unable to access Settings: database locked"
+					incr opts(-level)
+				}
 			}
 			return {*}$opts $msg
 		}

From 42d03e25c682d91b79f3f91f549e5088c34d7910 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 19 Oct 2020 11:44:53 +0000
Subject: [PATCH 29/91] Change to 0.5s, doubling for 4 tries

---
 webif/lib/settings.class | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index fa74b117..ac7c6d51 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -57,8 +57,8 @@ class settings {
 proc {settings _safer_query} { queryText args } {
 	global settingsdb
 
-	# allow 5 (too many?) tries with 1s (too long?) delay to get access
-	for {set lockCnt 5} {true} {sleep 1} {
+	# allow 4 tries from 0.5s delay, doubling, to get access
+	for {set lockCnt 4; set delay 0.5} {true} {sleep $delay; set delay $(2*$delay)} {
 		try {
 			return [$settingsdb query $queryText {*}$arg]
 		} on error {msg opts} {

From b9787a0a9f9dc6265c3d1d081734e287c54886e7 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 20 Oct 2020 18:34:19 +0000
Subject: [PATCH 30/91] Retry access in case the settings database is locked

---
 webif/lib/settings.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index ac7c6d51..f5edda2d 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -60,7 +60,7 @@ proc {settings _safer_query} { queryText args } {
 	# allow 4 tries from 0.5s delay, doubling, to get access
 	for {set lockCnt 4; set delay 0.5} {true} {sleep $delay; set delay $(2*$delay)} {
 		try {
-			return [$settingsdb query $queryText {*}$arg]
+			return [$settingsdb query $queryText {*}$args]
 		} on error {msg opts} {
 			if {[string first "database is locked" $msg] >= 0} {
 				if {[incr lockCnt -1] > 0} {

From 569bff9d601dc8258fe974852680db8b137f7f89 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Sun, 13 Dec 2020 23:24:12 +0000
Subject: [PATCH 31/91] Release 1.4.8-11

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index 8a5bd65c..cc40996e 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.8-10
+Version: 1.4.8-11
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From 6814880b40cc73f11d075cd69e5833c3a23b0243 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 1 Jan 2021 22:33:14 +0000
Subject: [PATCH 32/91] Understand Part/Pt. as a synonym for episode

---
 webif/lib/ts.class | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index b998d93f..9b164cee 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -697,6 +697,14 @@ ts method extract_numbers {} {
 	regexp -nocase -- {S\.*(\d+),?\s*Ep\.?\s*(\d+)(/(\d+))?} $synopsis \
 	    x seriesnum episodenum x episodetot
 
+    # (Part 5/10)
+	# (Pt. 5/10)                 
+	# (Part 5 of 10)
+	# (Pt. 5 of 10)
+	# (Pt5)
+	regexp -nocase -- {P(art|t\.?)\s*(\d+)\s*(of|/)?\s*(\d+)?} $synopsis \
+		x x episodenum x episodetot
+
 	foreach v {seriesnum episodenum episodetot} {
 		if {[set $v] eq ""} {
 			set $v 0

From 959aa9f8e67190359b8f0ac7008f5c6f060e5bac Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 11 Dec 2020 11:18:58 +0000
Subject: [PATCH 33/91] Avoid displaying negative free space

---
 webif/html/diskspace/diskspace.jim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webif/html/diskspace/diskspace.jim b/webif/html/diskspace/diskspace.jim
index d21b767c..5cd88c8d 100755
--- a/webif/html/diskspace/diskspace.jim
+++ b/webif/html/diskspace/diskspace.jim
@@ -9,6 +9,11 @@ lassign [system diskspace 1] size used perc free fperc tsrbuf tsrused
 set tsrreserve $($tsrbuf - $tsrused)
 # Adjust values to account for the TSR reserve
 set free $($free - $tsrreserve)
+# In case the reserve has been over-committed
+if {$free < 0)} {
+	# avoid displaying negative free, or used > available
+	set  free 0
+}
 set used $($size - $free)
 
 set dbs 0

From 6d0b1deebec5e4572cb4264e622e094b8f2fb089 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 31 Dec 2020 12:13:52 +0000
Subject: [PATCH 34/91] Banish extraneous )

---
 webif/html/diskspace/diskspace.jim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/diskspace/diskspace.jim b/webif/html/diskspace/diskspace.jim
index 5cd88c8d..58e98e34 100755
--- a/webif/html/diskspace/diskspace.jim
+++ b/webif/html/diskspace/diskspace.jim
@@ -10,7 +10,7 @@ set tsrreserve $($tsrbuf - $tsrused)
 # Adjust values to account for the TSR reserve
 set free $($free - $tsrreserve)
 # In case the reserve has been over-committed
-if {$free < 0)} {
+if {$free < 0} {
 	# avoid displaying negative free, or used > available
 	set  free 0
 }

From 0d99a7b24de79b36273becb1aaa456de82182c0e Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Mon, 18 Jan 2021 22:59:51 +0000
Subject: [PATCH 35/91] Update tvdb XML parsing utility

---
 webif/lib/bin/tvdb | Bin 14996 -> 15608 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/webif/lib/bin/tvdb b/webif/lib/bin/tvdb
index 57925b8c6b115128216352207db22f56caadeb05..f4237bfaf77c3b03ef30e86e5a69ee4f9f1cba3f 100755
GIT binary patch
delta 4505
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
NnD1#<9EAQr=)e0!-yHw|

delta 4048
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
L7qy1dwAua(41!n-


From eac48493267c40885d3b04cc24e6def344535ae2 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Mon, 18 Jan 2021 23:00:37 +0000
Subject: [PATCH 36/91] Update version

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index cc40996e..3dd73fd3 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.8-11
+Version: 1.4.9
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From 42619e6555dbdbd7498ba9b0dc1958b264098d9a Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Mon, 18 Jan 2021 23:05:01 +0000
Subject: [PATCH 37/91] Add to episode parsing tests

---
 webif/lib/test/episode | 5 +++++
 webif/lib/ts.class     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webif/lib/test/episode b/webif/lib/test/episode
index aeb7f768..333ef7dd 100755
--- a/webif/lib/test/episode
+++ b/webif/lib/test/episode
@@ -18,6 +18,11 @@ foreach {sample expected} {
 	{(S8, Ep2)} 		{S8E2/0}
 	{(S4 Ep22/24)} 		{S4E22/24}
 	{23/27.}		{S0E23/27}
+	{Part 5/10}		{S0E5/10}
+	{Pt. 5/10}		{S0E5/10}
+	{Part 5 of 10}		{S0E5/10}
+	{Pt. 5 of10}		{S0E5/10}
+	{Pt5}			{S0E5/0}
 } {
 	set ts [ts new "synopsis {$sample}"]
 	$ts episode_name
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 9b164cee..b9b6ee2b 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -698,7 +698,7 @@ ts method extract_numbers {} {
 	    x seriesnum episodenum x episodetot
 
     # (Part 5/10)
-	# (Pt. 5/10)                 
+	# (Pt. 5/10)
 	# (Part 5 of 10)
 	# (Pt. 5 of 10)
 	# (Pt5)

From 1a08892868deb13dae804e43d4b2e35104cb932e Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 11 Nov 2020 12:19:32 +0000
Subject: [PATCH 38/91] Allow minimum width for cut plan

Also
* add ID for estimated time row
* make the <label> for the Save Bookmarks checkbox actually be its label.
---
 webif/html/browse/crop/crop.jim | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/webif/html/browse/crop/crop.jim b/webif/html/browse/crop/crop.jim
index 24fb180a..1c3fe098 100755
--- a/webif/html/browse/crop/crop.jim
+++ b/webif/html/browse/crop/crop.jim
@@ -14,6 +14,7 @@ set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 
 set len [$ts duration 1]
+set planwidth 500
 
 puts "
 <fieldset>
@@ -29,7 +30,8 @@ puts [join [lmap i [$ts bookmarks 1] {
 	clock format $i -format "%T"
 }] ", "]
 
-puts "</td></tr><tr><th>&nbsp;</th><td id=cutplan>"
+# set minimum width as positioned contents doesn't resize its cell
+puts "</td></tr><tr><th>&nbsp;</th><td id=cutplan style=\"min-width: ${planwidth}px\">"
 
 puts "<div style=\"position: relative; top: -10px\">"
 
@@ -64,8 +66,8 @@ foreach b $bookmarks {
 	incr cur $l
 	append newbookmarks "[expr $cur + 3] "
 
-	set left $($start * 500 / $len)
-	set right $($end * 500 / $len)
+	set left $($start * $planwidth / $len)
+	set right $($end * $planwidth / $len)
 
 	div cut $last $($left - 1)
 	div keep $left $($right - 1)
@@ -78,11 +80,11 @@ foreach b $bookmarks {
 if {$start > 0} {
 	# Still in a keep section...
 	incr keeping $($len - $start)
-	set left $($start * 500 / $len)
+	set left $($start * $planwidth / $len)
 	div cut $last $($left - 1)
-	div keep $left 500
+	div keep $left $planwidth
 } else {
-	div cut $last 500
+	div cut $last $planwidth
 }
 
 if {$cur > $keeping - 8 && $keeping - 8 > 0} {
@@ -115,7 +117,7 @@ puts [join [lmap i $newbookmarks {
 puts " )</td></tr>"
 
 puts "
-<tr><th>Time:</th>
+<tr id=esttime><th>Time:</th>
 <td>Cropping will take around [clock format $esttime -format "%T"]</td></tr>
 </table>
 
@@ -130,9 +132,9 @@ puts "
 <td><button id=invert invert=$invert>Invert selection</button></td>
 <td><button id=cropit>Perform crop operation</button></td>
 <td>
-Save new bookmarks?
+<label id=saveitlabel for=saveit>Save new bookmarks?</label>
 <input id=saveit type=checkbox name=saveit checked>
-<label id=saveitlabel for=saveit>&nbsp;</label>
+&nbsp;
 </td>
 </tr></table>
 </div>

From b8964c8017e34cbcf7f7717ab24da9fd5ca3f8ac Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 11 Nov 2020 13:04:34 +0000
Subject: [PATCH 39/91] Check that bookmark save succeeded

If not, enable the old "Save new bookmarks" button.

Also
* add icons for buttons
* simplify invert URL handling.
---
 webif/html/browse/crop/crop.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/webif/html/browse/crop/crop.js b/webif/html/browse/crop/crop.js
index a400e0bb..dfaed439 100755
--- a/webif/html/browse/crop/crop.js
+++ b/webif/html/browse/crop/crop.js
@@ -1,12 +1,5 @@
 var handle = 0;
 
-function escapestring(str)
-{
-	str = JSON.stringify(String(str));
-	str = str.substring(1, str.length - 1);
-	return str;
-}
-
 function update()
 {
 	$.get('progress.jim', {
@@ -27,7 +20,8 @@ $('[type="checkbox"]').iphoneStyle({
 
 $('#progressbar').reportprogress(0);
 
-$('#back').button().click(function() {
+$('#back').button({icons: {primary: "ui-icon-arrowreturnthick-1-w"}})
+    .on('click', function() {
 	window.location = '/go/browse?dir=' + $('#params').attr('dir');
 });
 
@@ -44,10 +38,17 @@ $('#save').button({icons: {primary: "ui-icon-disk"}})
 		    .slideUp('slow');
 		$('#originalbookmarks')
 		    .html($('#newbookmarks').clone());
+		$('#esttime').hide();
+		if ($('#results').html().indexOf(' successful') < 0) {
+			$('#saveit').hide();
+			$('#saveitlabel').hide();
+			$('#save').show();
+		}
 	});
 });
 
-$('#cropit').button().click(function() {
+$('#cropit').button({icons: {primary: "ui-icon-scissors"}})
+    .on('click', function() {
 	$('#cropdiv').hide('slow');
 	$('#progressdiv').show('slow');
 	$('#back').hide();
@@ -56,7 +57,7 @@ $('#cropit').button().click(function() {
 	    .load('execute.jim', {
 		'file': $('#params').attr('file'),
 		'invert': $('#invert').attr('invert')
-	    }, function() {
+	}, function() {
 		clearInterval(handle);
 		handle = 0;
 		$('#back,#save').show();
@@ -73,10 +74,10 @@ $('#cropit').button().click(function() {
 	});
 });
 
-$('#invert').button().on('click', function() {
-	window.location = 'crop.jim?file=' +
-	    escapestring($('#params').attr('file')) +
-	   '&invert=' + ($(this).attr('invert') == '1' ? '0' : '1');
+$('#invert').button({icons: {primary: "ui-icon-shuffle"}})
+    .on('click', function() {
+	window.location = window.location.href.replace(/&invert=[01]/,'') +
+	    '&invert=' + ($(this).attr('invert') == '1' ? '0' : '1');
 });
 
 });

From eb7f9667ba077d39c98b65b53622942ca19f18f0 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 23 Feb 2021 00:13:08 +0000
Subject: [PATCH 40/91] Avoid negative CSS widths

---
 webif/html/browse/crop/crop.jim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webif/html/browse/crop/crop.jim b/webif/html/browse/crop/crop.jim
index 1c3fe098..f7179566 100755
--- a/webif/html/browse/crop/crop.jim
+++ b/webif/html/browse/crop/crop.jim
@@ -37,6 +37,10 @@ puts "<div style=\"position: relative; top: -10px\">"
 
 proc div {type left right} {
 	set width $($right - $left)
+	if {$width < 0} {
+		# negative values are invalid for CSS width
+		set width 0
+	}
 	puts "<div class=$type style=\"left: ${left}px; width: ${width}px\">
 	    $type</div>"
 }

From 0e6a67d24a2da1f16cc82c04309074f45b9127ad Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 23 Feb 2021 00:16:04 +0000
Subject: [PATCH 41/91] Ensure cut plan segments are aligned left

---
 webif/html/browse/crop/style.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webif/html/browse/crop/style.css b/webif/html/browse/crop/style.css
index f0e45465..74e82d44 100644
--- a/webif/html/browse/crop/style.css
+++ b/webif/html/browse/crop/style.css
@@ -11,3 +11,8 @@ div.sliderlabel
 	line-height: 40px;
 }
 
+#cutplan {
+	/* ensure cut plan segments are aligned left */
+	padding-left: 0;
+}
+

From ad9b48b0d26f085b77fb87edc3c7586e44567de6 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Wed, 4 Nov 2020 14:16:09 +0000
Subject: [PATCH 42/91] Remove unnecessary exec

Jim supports the pwd command since at least https://github.com/msteveb/jimtcl/commit/6461e8bf6ddf82ee974b4c63458915490d74a5ce, so no need to exec it.
---
 webif/html/dedup/dedup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/dedup/dedup b/webif/html/dedup/dedup
index 550a05a9..a8787857 100755
--- a/webif/html/dedup/dedup
+++ b/webif/html/dedup/dedup
@@ -19,7 +19,7 @@ foreach arg $argv {
 		lappend dirs $arg
 	}
 }
-if {![llength $dirs]} { lappend dirs [exec pwd] }
+if {![llength $dirs]} { lappend dirs [pwd] }
 
 foreach dir $dirs {
 	if {[string index $dir end] eq "/"} {

From 2f28b0a66e7f1628fa45b7bfefe26f0bb04d6656 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sun, 21 Feb 2021 07:24:50 +0000
Subject: [PATCH 43/91] Improve listing of directories with special characters,
 especially spaces.

---
 webif/html/browse/index.jim |  5 +-
 webif/html/browse/script.js |  9 +++-
 webif/lib/utils             | 95 +++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 9c279736..2c8266d5 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -69,7 +69,7 @@ proc directory {file bfile tbfile} {
 	puts "<a class=dbf
 	    href=\"$::env(SCRIPT_NAME)?dir=[cgi_quote_url $file]\"
 	    file=\"[cgi_quote_html $file]\">"
-	puts "$bfile</a><span class=filesize id=\"$tbfile\">
+	puts "[string map {" " &nbsp;} $bfile]</a><span class=filesize id=\"ID$tbfile\">
 		</span>"
 
 	lassign [dir iconset $file] icons attrs
@@ -106,13 +106,12 @@ proc entry {file} {{i 0}} {
 	global dircount filecount dinuse
 
 	set bfile [file tail $file]
-	regsub -all " +" $bfile "" tbfile
 	if {[string index $bfile 0] == "\025"} {
 		set bfile [string range $bfile 1 end]
 	}
 	if {[file isdirectory "$file"]} {
 		incr dircount
-		directory $file $bfile $tbfile
+		directory $file $bfile [b64uencode [jsescape $bfile]]
 		return
 	}
 	set ext [string tolower [file extension $file]]
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 28ad4b1b..cec02bb3 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -111,8 +111,13 @@ function epginfo_callback(data, status, xhr)
 
 function insert_folder_size(folder, size)
 {
-	folder = folder.replace(/ /g, '');
-	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+	// folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+	// ID of size element is ID + RFC4648 s5 encoding of folder name
+	folder = "ID" + 
+             btoa(escape(folder))
+                     .replace(/\+/g, '-')
+                     .replace(/\//g, '_')
+                     .replace(/=/g, '');	
 	//console.log("Folder: (%s) = (%s)", folder, size);
 	if (size.search(/\d$/) == -1)
 		size += 'iB';
diff --git a/webif/lib/utils b/webif/lib/utils
index 53eaf041..e9b794b3 100644
--- a/webif/lib/utils
+++ b/webif/lib/utils
@@ -20,3 +20,98 @@ proc midnight {} {{today ""}} {
 	return [clock scan "$today 00:00:00" -format "%Y %m %d %T"]
 }
 
+# Base-64 according to RFC 4648
+# See https://wiki.tcl-lang.org/page/base64
+
+if {![exists -command binary]} { package require binary }
+
+# RFC 4648 section 4
+set  ::b64::map {
+        000000 A 000001 B 000010 C 000011 D 000100 E 000101 F
+        000110 G 000111 H 001000 I 001001 J 001010 K 001011 L
+        001100 M 001101 N 001110 O 001111 P 010000 Q 010001 R
+        010010 S 010011 T 010100 U 010101 V 010110 W 010111 X
+        011000 Y 011001 Z 011010 a 011011 b 011100 c 011101 d
+        011110 e 011111 f 100000 g 100001 h 100010 i 100011 j
+        100100 k 100101 l 100110 m 100111 n 101000 o 101001 p
+        101010 q 101011 r 101100 s 101101 t 101110 u 101111 v
+        110000 w 110001 x 110010 y 110011 z 110100 0 110101 1
+        110110 2 110111 3 111000 4 111001 5 111010 6 111011 7
+        111100 8 111101 9 111110 + 111111 /
+}
+
+set ::b64::unmap [join [lmap {a b} $::b64::map {list $b $a}]]
+
+proc ::b64::encode {str} {
+    binary scan $str B* bits
+    switch [expr {[string length $bits]%6}] {
+        0 {set tail {}}
+        2 {append bits 0000; set tail ==}
+        4 {append bits 00; set tail =}
+    }
+    return [string cat [string map $::b64::map $bits] $tail]
+}
+
+proc ::b64::decode {str} {
+    set nstr [string trimright $str =]
+    set dstr [string map $::b64::unmap $nstr]
+    switch [expr [string length $str]-[string length $nstr]] {
+        0 {#nothing to do}
+        1 {set dstr [string range $dstr 0 {end-2}]}
+        2 {set dstr [string range $dstr 0 {end-4}]}
+    }
+    return [binary format B* $dstr]
+}
+
+# RFC 4648 section 5
+proc ::b64::url_encode {str} {
+    tailcall string map {+ - / _ = ""} [::b64::encode $str]
+}
+
+proc ::b64::url_decode {str} {
+    tailcall ::b64::decode [string map {- + _ /} $str]
+}
+
+alias b64encode ::b64::encode
+alias b64decode ::b64::decode
+alias b64uencode ::b64::url_encode
+alias b64udecode ::b64::url_decode
+
+
+# ECMA-262 Annex B.2.1
+proc ::js::_escape {str} {
+	return [join [lmap c [split $str ""] {
+			if {1 != [scan $c "%c" cc]} {
+				format "%s" $c
+			} elseif {$cc < 256} {
+				format "%%%02X" $cc
+			} else {
+				format "%%u%04X" $cc
+			}
+		}] ""]
+}
+
+proc ::js::_unescape {str} {
+	if {1 == [scan $str "%%%2x" cc] ||
+	    1 == [scan $str "%%u%4x" cc]} {
+		return [format "%c" $cc]
+	} else {
+		return $str
+	}
+}
+
+proc ::js::escape {str} {
+	return [subst -nobackslashes -novariables \
+		[regsub -all -- {[^A-Za-z0-9@*_+-./]+} $str \
+			{[::js::_escape "&"]}]]
+}
+
+proc ::js::unescape {str} {
+	return [subst -nobackslashes -novariables \
+		[regsub -all -- {%(u[[:xdigit:]]{2})?[[:xdigit:]]{2}} $str \
+			{[::js::_unescape "&"]}]]
+}
+
+alias jsescape ::js::escape
+alias jsunescape ::js::unescape
+

From fac0dee6935139a548b3596edc2904714ba03914 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sun, 21 Feb 2021 12:33:55 +0000
Subject: [PATCH 44/91] Fix quoting of replacement text, avoiding "unmatched ]"

---
 webif/lib/utils | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webif/lib/utils b/webif/lib/utils
index e9b794b3..7eb71e45 100644
--- a/webif/lib/utils
+++ b/webif/lib/utils
@@ -103,13 +103,13 @@ proc ::js::_unescape {str} {
 proc ::js::escape {str} {
 	return [subst -nobackslashes -novariables \
 		[regsub -all -- {[^A-Za-z0-9@*_+-./]+} $str \
-			{[::js::_escape "&"]}]]
+			{[::js::_escape {&}]}]]
 }
 
 proc ::js::unescape {str} {
 	return [subst -nobackslashes -novariables \
 		[regsub -all -- {%(u[[:xdigit:]]{2})?[[:xdigit:]]{2}} $str \
-			{[::js::_unescape "&"]}]]
+			{[::js::_unescape {&}]}]]
 }
 
 alias jsescape ::js::escape

From e884a2ebadde317b92c17ebcf3d7539a8fd57350 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sun, 21 Feb 2021 19:40:07 +0000
Subject: [PATCH 45/91] Also use non-breaking spaces in file name display

---
 webif/html/browse/index.jim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 2c8266d5..6351ab57 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -58,6 +58,10 @@ proc icon {img {hover ""} {extra ""} {class "va"}} {
 	puts ">"
 }
 
+proc nbsp {str} {
+	return [string map {" " &nbsp;} $str]
+}
+
 proc directory {file bfile tbfile} {
 	puts "<div class=\"va relative\">"
 	set img "/images/711_1_09_Media_Folder.png"
@@ -69,7 +73,7 @@ proc directory {file bfile tbfile} {
 	puts "<a class=dbf
 	    href=\"$::env(SCRIPT_NAME)?dir=[cgi_quote_url $file]\"
 	    file=\"[cgi_quote_html $file]\">"
-	puts "[string map {" " &nbsp;} $bfile]</a><span class=filesize id=\"ID$tbfile\">
+	puts "[nbsp $bfile]</a><span class=filesize id=\"ID$tbfile\">
 		</span>"
 
 	lassign [dir iconset $file] icons attrs
@@ -173,7 +177,7 @@ proc entry {file} {{i 0}} {
 		<input class=\"$fscl\" type=checkbox>
 		<a class=bf title=\"$synopsis\"
 		    file=\"[cgi_quote_html $file]\" type=$type href=#>
-		    $bfile
+		    [nbsp $bfile]
 	        </a>
 	"
 

From 11cfa40d7849677f2de4b98363290b97145eeba6 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 18 Feb 2021 13:06:49 +0000
Subject: [PATCH 46/91] Fix typo and < vs <= in `dbfetch -trange` option:
 avoids missing channels in EPG.

---
 webif/lib/epg.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/lib/epg.class b/webif/lib/epg.class
index 5c9420f1..a32f40e9 100644
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -482,7 +482,7 @@ proc {epg dbfetch} {mode args} {
 					append q "and (e.start is null or
 					(e.start > $stt and e.start < $ett) or
 					(e.end > $stt and e.end < $ett) or
-					(e.start < $stt and e.end > $stt)
+					(e.start <= $stt and e.end >= $ett)
 					) "
 				}
 				-fav {

From 3f7533354218a31fb62be508f7665317d181cb67 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 18 Feb 2021 13:57:33 +0000
Subject: [PATCH 47/91] Display raw programme times, not clipped to the display
 period.

---
 webif/html/xepg/index.jim | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim
index a1360466..fef0fd5b 100755
--- a/webif/html/xepg/index.jim
+++ b/webif/html/xepg/index.jim
@@ -263,6 +263,15 @@ foreach e $records {
 
 	if {$es < $le} continue
 
+	set perc [$e percent]
+	set showing 0
+	if {$perc > 0 && $perc < 100} { set showing 1 }
+
+	set txt [list [cgi_quote_html [$e get name]] "([\
+	    clock format $es -format "%H:%M"] - [\
+	    clock format $ee -format "%H:%M"])[\
+	    expr {$showing? " ($perc%)": ""}]"]
+
 	if {$es < $stt} { set es $stt }
 	if {$ee > $ett} { set ee $ett }
 
@@ -292,21 +301,6 @@ foreach e $records {
 	set recopts 1
 	if {[$e get series_crid] ne ""} { set recopts 2 }
 
-	set perc [$e percent]
-	set showing 0
-	if {$perc > 0 && $perc < 100} { set showing 1 }
-
-	set txt "[cgi_quote_html [$e get name]] <span>([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append txt " ($perc%)" }
-	append txt "</span>"
-
-	set htxt "[cgi_quote_html [$e get name]] ([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append hxt " ($perc%)" }
-
 	set lbg $bg
 	# Set backround if scheduled. 1 1-off, 2 series, 3 recorded, 4 skipped
 	switch -- [$e scheduled] {
@@ -318,11 +312,11 @@ foreach e $records {
 	}
 
 	puts "<div class=\"xeprog $lbg\"
-	    style=\"width: [expr $px - 4]px;\" title=\"$htxt\">
+	    style=\"width: [expr $px - 4]px;\" title=\"[join $txt]\">
 	    <a class=event href=# xs=[$e get service_id]
 		xe=[$e get event_id] sch=[$e get sched_type]
 		rec=$recopts>"
-	puts $txt
+	puts [format "%s <span>%s</span>" {*}$txt]
 	puts "</a>"
 	puts "</div>"
 }

From 763abda557093d97984b09b7e776d2f4eac6bd27 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 18 Feb 2021 18:42:07 +0000
Subject: [PATCH 48/91] Remove unwanted padding before programme divs in EPG to
 avoid cumulative positioning error.

---
 webif/html/xepg/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/xepg/style.css b/webif/html/xepg/style.css
index a6b17215..51df33b7 100644
--- a/webif/html/xepg/style.css
+++ b/webif/html/xepg/style.css
@@ -99,7 +99,7 @@ div.xeprog
 	float: left;
 	vertical-align: middle;
 	height: 25px;
-	padding: 4px 0 3px 2px;
+	padding: 4px 0 3px 0px;
 	margin: 3px 0 3px 2px;
 	border: 1px solid #ccc;
 	border-radius: 10px;

From 0c1bb71520a99ba4e8869deab239c18f246a498b Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 14 Dec 2020 14:06:48 +0000
Subject: [PATCH 49/91] exists -proc -> exists -command

`exists -command` subsumes `exists -proc`

This test is generally checking whether the command exists, rather than some proc that is overriding it.

Currently `class` is a proc but this may not always be so.
---
 webif/lib/browse.class    | 2 +-
 webif/lib/clipboard.class | 2 +-
 webif/lib/epg.class       | 4 ++--
 webif/lib/pkg.class       | 2 +-
 webif/lib/queue.class     | 4 ++--
 webif/lib/rsv.class       | 6 +++---
 webif/lib/settings.class  | 4 ++--
 webif/lib/svc.class       | 4 ++--
 webif/lib/system.class    | 6 +++---
 webif/lib/ts.class        | 6 +++---
 webif/lib/tvdb.class      | 4 ++--
 webif/lib/xml.class       | 2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/webif/lib/browse.class b/webif/lib/browse.class
index 31ae38b2..cffe0d2c 100644
--- a/webif/lib/browse.class
+++ b/webif/lib/browse.class
@@ -1,7 +1,7 @@
 
 require system.class plugin
 
-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }
 class dir {}
 class browse {}
 
diff --git a/webif/lib/clipboard.class b/webif/lib/clipboard.class
index 4cf63407..5dc3f519 100644
--- a/webif/lib/clipboard.class
+++ b/webif/lib/clipboard.class
@@ -1,5 +1,5 @@
 
-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }
 
 class clipboard {
 	path	"/tmp/webif.cb"
diff --git a/webif/lib/epg.class b/webif/lib/epg.class
index a32f40e9..db05d262 100644
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -1,7 +1,7 @@
 source /mod/webif/lib/setup
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 
 require settings.class progressbar rsv.class mwildcard svc.class
 
diff --git a/webif/lib/pkg.class b/webif/lib/pkg.class
index edd5e98d..0cee5258 100755
--- a/webif/lib/pkg.class
+++ b/webif/lib/pkg.class
@@ -1,5 +1,5 @@
 
-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }
 
 class pkg {
 	name		""
diff --git a/webif/lib/queue.class b/webif/lib/queue.class
index 4f8011ac..b9811cfa 100644
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -1,6 +1,6 @@
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 
 class queue {
 	id		-1
diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index f920c442..b18090b3 100644
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -1,8 +1,8 @@
 source /mod/webif/lib/setup
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
-if {![exists -proc binary]} { package require binary }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
+if {![exists -command binary]} { package require binary }
 require settings.class system.class plugin svc.class
 
 set binaryfields aulEventToRecordInfo
diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index f5edda2d..0fd81e63 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -1,6 +1,6 @@
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 
 if {![file exists /mod/etc/webif.db]} {
 	set ::settingsdb [sqlite3.open /mod/etc/webif.db]
diff --git a/webif/lib/svc.class b/webif/lib/svc.class
index d2d146ae..509043b5 100755
--- a/webif/lib/svc.class
+++ b/webif/lib/svc.class
@@ -1,7 +1,7 @@
 source /mod/webif/lib/setup
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 require system.class
 
 class svc {
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 8fbc7639..f4923061 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -3,9 +3,9 @@ source /mod/webif/lib/setup
 
 package require xconv
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
-if {![exists -proc binary]} { package require binary }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
+if {![exists -command binary]} { package require binary }
 
 class system {}
 
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index b9b6ee2b..7aba2c1d 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -1,7 +1,7 @@
 
-if {![exists -proc class]} { package require oo }
-if {![exists -proc pack]} { package require pack }
-if {![exists -proc xconv]} { package require xconv }
+if {![exists -command class]} { package require oo }
+if {![exists -command pack]} { package require pack }
+if {![exists -command xconv]} { package require xconv }
 source /mod/webif/lib/setup
 require system.class tvdb.class classdump
 
diff --git a/webif/lib/tvdb.class b/webif/lib/tvdb.class
index 2abc5803..c81cd529 100644
--- a/webif/lib/tvdb.class
+++ b/webif/lib/tvdb.class
@@ -1,8 +1,8 @@
 source /mod/webif/lib/setup
 
 package require cgi
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 require system.class xml.class
 
 set ::tvdb::apikey 1764335F804A5A91
diff --git a/webif/lib/xml.class b/webif/lib/xml.class
index 7cde513b..8c3025ed 100644
--- a/webif/lib/xml.class
+++ b/webif/lib/xml.class
@@ -2,7 +2,7 @@
 # From https://wiki.tcl-lang.org/page/Parsing+XML
 # Keith Vetter 2004-03-01
 
-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }
 
 class xml {
 	xml	""

From 39dae95f28595e031bbf005a2454f295ed153c2a Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 9 Nov 2020 13:53:03 +0000
Subject: [PATCH 50/91] Set maximum width for File column

Add title attribute to display possibly truncated File as tooltip.

Will this work well for mobile/touchscreen use?
---
 webif/html/diag/queue/script.js | 3 ++-
 webif/html/diag/queue/style.css | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/webif/html/diag/queue/script.js b/webif/html/diag/queue/script.js
index ad6a2134..93c83b06 100644
--- a/webif/html/diag/queue/script.js
+++ b/webif/html/diag/queue/script.js
@@ -40,7 +40,8 @@ function load()
 			$('<td>').append($('<a>', {
 				'class': 'file',
 				href: '#',
-				html: v.file
+				html: v.file,
+				title: v.file
 			})).appendTo($row);
 			$('<td>', { html: v.action + ' ' + v.args })
 			    .appendTo($row);
diff --git a/webif/html/diag/queue/style.css b/webif/html/diag/queue/style.css
index a9e1b153..df2ed7b0 100644
--- a/webif/html/diag/queue/style.css
+++ b/webif/html/diag/queue/style.css
@@ -1,3 +1,10 @@
+/* constrain File column width */
+td:nth-child(3), th:nth-child(3)
+{
+    max-width: 50ch;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 
 td.status
 {

From 00689a2036a61b779d7542c5947b8ec5ace71761 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 2 Nov 2020 15:14:23 +0000
Subject: [PATCH 51/91] Make 127.0.0.1 the default host for `system dlnahelper`

In all the cases where `system dlnahelper` is called, no host/IP part is specified, and those cases are creating a URL that only needs to be accessible from the same machine, where the loopback address should be the default.

Should fix eg https://hummy.tv/forum/threads/detectads-not-always-succesful.9936/post-147241.
---
 webif/lib/system.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/lib/system.class b/webif/lib/system.class
index f4923061..d67cca76 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -309,7 +309,7 @@ proc {system dlnaurl} {file {urlbase ""}} {
 	return $ret
 }
 
-proc {system dlnahelper} {file {urlbase ""}} {
+proc {system dlnahelper} {file {urlbase "127.0.0.1"}} {
 	set dir /mnt/hd2/mod/.dlnahelper
 	require lock
 

From 88d3274241a0971e1690506abda3562bfadbc16c Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 9 Feb 2021 15:10:05 +0000
Subject: [PATCH 52/91] Error protect database access; re-create corrupt queue
 DB.

---
 webif/lib/queue.class | 198 ++++++++++++++++++++++++++----------------
 1 file changed, 122 insertions(+), 76 deletions(-)

diff --git a/webif/lib/queue.class b/webif/lib/queue.class
index b9811cfa..59715a02 100644
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -53,77 +53,127 @@ proc {queue dbhandle} {args} {
 		return $::queue::db
 	}
 
-	if {![file exists /mod/etc/queue.db]} {
-		set ::queue::db [sqlite3.open /mod/etc/queue.db]
-		$::queue::db query {
-			create table queue(
-				id integer primary key autoincrement,
-				file text,
-				action text,
-				args text,
-				start integer default 0,
-				status text default 'PENDING',
-				log text default '',
-				runtime integer,
-				retries integer default 0,
-				interrupts integer default 0,
-				submitted integer default 0,
-				last integer default 0
-			);
+	try {
+		set db [sqlite3.open /mod/etc/queue.db]
+	} on error {msg} {
+		stderr puts $msg
+		return 0
+	}
+	if {[catch {$db query { select count(*) from queue, config; }}]} {
+		catch {$db {drop table queue}}
+		catch {$db {drop table config}}
+		try {
+			$db query {
+				create table queue(
+				    id integer primary key autoincrement,
+				    file text,
+				    action text,
+				    args text,
+				    start integer default 0,
+				    status text default 'PENDING',
+				    log text default '',
+				    runtime integer,
+				    retries integer default 0,
+				    interrupts integer default 0,
+				    submitted integer default 0,
+				    last integer default 0
+				);
+			}
+			$db query {
+				create table config(
+				    var text,
+				    val text
+				);
+			}
+			$db query {
+				insert into config values('version', 3);
+			}
+			$db query {
+				create unique index file on queue(file, action);
+			}
+		} on error {msg opts} {
+			stderr puts $msg
+			catch {$db close}
+			return 0
 		}
-		$::queue::db query {
-			create table config(
-				var text,
-				val text
-			);
-		}
-		$::queue::db query {
-			insert into config values('version', 3);
-		}
-		$::queue::db query {
-			create unique index file on queue(file, action);
-		}
-	} else {
-		set ::queue::db [sqlite3.open /mod/etc/queue.db]
 	}
 
-	return $::queue::db
+	return [set ::queue::db $db]
+}
+
+proc {queue dbquery} {query args} {
+	set db [queue dbhandle]
+	try {
+		return [$db query $query {*}$args]
+	} on error {msg opts} {
+		return {}
+	}
+}
+
+proc {queue dbaction} {query args} {
+	set db [queue dbhandle]
+	try {
+		$db query $query {*}$args
+		return true
+	} on error {msg opts} {
+		return false
+	}
+}
+
+proc {queue dbqueryl} {query_list {txn_mode ""}} {
+	set db [queue dbhandle]
+	try {
+		if {$txn_mode ne ""} {
+			if {$txn_mode ni { immediate exclusive }} {
+				set txn_mode "deferred"
+			}
+			$db query "begin %s transaction" $txn_mode
+		}
+		foreach q $query_list {
+			$db query {*}$q
+		}
+		if {$txn_mode ne ""} {
+			$db query "commit transaction"
+		}
+		return true
+	} on error {msg opts} {
+	}
+	if {$txn_mode ne ""} {
+		catch { $db query "rollback transaction" }
+	}
+	return false
 }
 
 proc {queue startup} {{days 7}} {
 	if {$days == 0} { set days 7 }
-	set db [queue dbhandle]
-	$db query {
+	return [queue dbqueryl { { {
 		update queue
 		set status = 'INTERRUPTED',
 		log = 'Job will be retried automatically.',
 		retries = retries + 1,
 		interrupts = interrupts + 1
 		where status = 'RUNNING'
-	}
-	$db query {
+	} } { {
 		update queue
 		set status = 'FAILED',
 		log = 'Too many interrupts.'
 		where status = 'INTERRUPTED'
 		and interrupts >= 5
-	}
-	$db query {
+	} } { {
 		update queue
 		set status = 'PENDING'
 		where status = 'DEFER'
-	}
-	$db query {
+	} } { {
 		delete from queue
 		where status in ('COMPLETE', 'FAILED')
 		and submitted < %s
 	} [expr [clock seconds] - 86400 * $days]
+	} } ]
 }
 
 proc {queue fetch} {file action} {
-	set db [queue dbhandle]
 
-	foreach row [$db query {
+	foreach row [queue dbquery {
 		select * from queue
 		where file = '%s'
 		and action = '%s'
@@ -134,23 +184,23 @@ proc {queue fetch} {file action} {
 }
 
 proc {queue insert} {args file action} {
-	set db [queue dbhandle]
 
 	set status "PENDING"
 	if {"-hold" in $args} { set status "HOLD" }
 
 	set file [queue key $file]
 
-	$db query {
+	if {[queue dbaction {
 		insert or ignore into queue(submitted, file, action, status)
 		values(%s, '%s', '%s', '%s')
-	} [clock seconds] $file $action $status
+	} [clock seconds] $file $action $status]} {
 
-	return [queue fetch $file $action]
+		return [queue fetch $file $action]
+	}
+	return 0
 }
 
 proc {queue delete} {file {action "*"}} {
-	set db [queue dbhandle]
 
 	set q "
 		delete from queue
@@ -161,11 +211,10 @@ proc {queue delete} {file {action "*"}} {
 		append q " and action = '%s'"
 	}
 
-	$db query $q [queue key $file] $action
+	return [queue dbaction $q [queue key $file] $action]
 }
 
 proc {queue delete_by_id} {id} {
-	set db [queue dbhandle]
 
 	set q "
 		delete from queue
@@ -173,11 +222,10 @@ proc {queue delete_by_id} {id} {
 		and status != 'RUNNING'
 	"
 
-	$db query $q $id
+	return [queue dbaction $q $id]
 }
 
 proc {queue resubmit} {id} {
-	set db [queue dbhandle]
 
 	set q "
 		update queue
@@ -186,11 +234,10 @@ proc {queue resubmit} {id} {
 		and status in ('FAILED', 'HOLD', 'COMPLETE')
 	"
 
-	$db query $q $id
+	return [queue dbaction $q $id]
 }
 
 proc {queue hold} {id} {
-	set db [queue dbhandle]
 
 	set q "
 		update queue
@@ -199,15 +246,13 @@ proc {queue hold} {id} {
 		and status not in ('RUNNING', 'COMPLETE')
 	"
 
-	$db query $q $id
+	return [queue dbaction $q $id]
 }
 
 proc {queue status} {file} {
 	if {$file eq "0"} { return "" }
 
-	set db [queue dbhandle]
-
-	set ret [$db query {
+	set ret [queue dbquery {
 		select group_concat(action)
 		from queue
 		where file = '%s'
@@ -230,10 +275,9 @@ proc {queue check} {file {q "any"}} {
 }
 
 proc {queue all} {} {
-	set db [queue dbhandle]
 
 	set ret {}
-	foreach row [$db query {select * from queue order by id}] {
+	foreach row [queue dbquery {select * from queue order by id}] {
 		lappend ret [queue new $row]
 	}
 	return $ret
@@ -243,7 +287,7 @@ proc {queue pending} {} {
 	set db [queue dbhandle]
 
 	set ret {}
-	foreach row [$db query {
+	foreach row [queue dbquery {
 		select * from queue
 		where status in ('PENDING', 'INTERRUPTED')
 		and start < %s
@@ -259,23 +303,20 @@ proc {queue size} {} {
 }
 
 proc {queue version} {} {
-	set db [queue dbhandle]
 
 	set version 1
-	catch {
-		foreach row [$db query {
+	foreach row [queue dbquery {
 			select val from config
 			where var = 'version'
 		}] {
-			lassign $row x version
-		}
+		lassign $row x version
 	}
 	return $version
 }
 
 queue method update {_status {_log ""} {_retries 0} {_runtime 0}} {
-	set db [queue dbhandle]
-	$db query {
+
+	if {[queue dbaction {
 		update queue
 		set status = '%s',
 		    log = '%s',
@@ -283,22 +324,27 @@ queue method update {_status {_log ""} {_retries 0} {_runtime 0}} {
 		    runtime = %s,
 		    last = %s
 		where id = %s
-	} $_status $_log $_retries $_runtime [clock seconds] $id
+	} $_status $_log $_retries $_runtime [clock seconds] $id]} {
 
-	set status $_status
-	set log $_log
-	incr retries $_retries
-	set runtime $_runtime
+		set status $_status
+		set log $_log
+		incr retries $_retries
+		set runtime $_runtime
+		return true
+	}
+	return false
 }
 
 queue method set {var val} {
-	set db [queue dbhandle]
-	$db query {
+
+	if {[queue dbaction {
 		update queue
 		set %s = '%s'
 		where id = %s
-	} $var $val $id
-	set $var $val
+	    } $var $val $id]} {
+		set $var $val
+	}
+	return $var
 }
 
 queue method submit {{_start 0}} {

From 7c4d359aecef538cbb5488d27364c25b070ad691 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 31 Dec 2020 15:18:03 +0000
Subject: [PATCH 53/91] Reduce (or apply) maximum lengths for title and
 synopsis, allowing for character set prefix byte

---
 webif/html/browse/assets.jim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webif/html/browse/assets.jim b/webif/html/browse/assets.jim
index d08b4f44..8735f9ab 100755
--- a/webif/html/browse/assets.jim
+++ b/webif/html/browse/assets.jim
@@ -103,6 +103,8 @@ if {[llength $plugins(dmenu)]} {
 	}
 }
 
+# the maxlength values for title and synopsis are 1 less than the maximum to 
+# allow for an extra byte to indicate character encoding (see rename.jim)
 puts {
 </ul>
 
@@ -131,7 +133,7 @@ puts {
 	</th>
 	<td>
 		<input type=text name="rename_title" id="rename_title"
-		    value="" size=70 maxlength=48
+		    value="" size=70 maxlength=47
 		    class="text ui-widget-content ui-corner-all">
 	</td>
 	</tr>
@@ -144,7 +146,7 @@ puts {
 	</th>
 	<td>
 		<textarea name="rename_synopsis" id="rename_synopsis"
-		    value="" cols=70 rows=4
+		    value="" cols=70 rows=4 maxlength=251
 		    class="text ui-widget-content ui-corner-all"></textarea>
 	</td>
 	</tr>

From db477e5d4282fdf1df568d525d0452629da4a3fa Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 31 Dec 2020 15:22:42 +0000
Subject: [PATCH 54/91] Add missing $ for certain variable references

Missing $s invalidated attempts to check the length of title, synopsis, guidance.
---
 webif/lib/ts.class | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 7aba2c1d..c74a8bdd 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -296,21 +296,21 @@ ts method copy {dst} {
 }
 
 ts method settitle {newtitle} {
-	if {[string length newtitle] > 48} { return }
+	if {[string length $newtitle] > 48} { return }
 
 	exec /mod/bin/hmt "+settitle=${newtitle}" $file
 	set title $newtitle
 }
 
 ts method setsynopsis {newsynopsis} {
-	if {[string length newsynopsis] > 252} { return }
+	if {[string length $newsynopsis] > 252} { return }
 
 	exec /mod/bin/hmt "+setsynopsis=${newsynopsis}" $file
 	set synopsis $newsynopsis
 }
 
 ts method setguidance {newguidance} {
-	if {[string length newguidance] > 48} { return }
+	if {[string length $newguidance] > 48} { return }
 
 	if {$newguidance eq ""} {
 		exec /mod/bin/hmt "-guidance" $file

From 5c8a5733821b24767d34c1bbcb91871d43c1ecc8 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 22 Feb 2021 19:31:20 +0000
Subject: [PATCH 55/91] Correct the maximum length enforced for guidance text
 (74 vs 48)

---
 webif/lib/ts.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index c74a8bdd..6023ec14 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -310,7 +310,7 @@ ts method setsynopsis {newsynopsis} {
 }
 
 ts method setguidance {newguidance} {
-	if {[string length $newguidance] > 48} { return }
+	if {[string length $newguidance] > 74} { return }
 
 	if {$newguidance eq ""} {
 		exec /mod/bin/hmt "-guidance" $file

From a748870195c63d449b696b3e22ba7aef9e0b67a4 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Mon, 19 Oct 2020 12:25:50 +0000
Subject: [PATCH 56/91] Add test for matching key for DLNA; fallback to direct;
 fail if no key matches

---
 webif/lib/auto/plugin/decrypt/queue.hook | 29 +++++-------
 webif/lib/ts.class                       | 59 +++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/webif/lib/auto/plugin/decrypt/queue.hook b/webif/lib/auto/plugin/decrypt/queue.hook
index bc4e6cc5..05c74b7a 100644
--- a/webif/lib/auto/plugin/decrypt/queue.hook
+++ b/webif/lib/auto/plugin/decrypt/queue.hook
@@ -94,6 +94,13 @@ proc ::decrypt::dequeue {q ts} {
 	::auto::startclock
 	log "  DECRYPT: $rfile" 0
 
+	if {$mode eq "dlna"} {
+		if {[$ts getkey $mode] eq ""} {
+			::auto::log "system key doesn't match, trying direct"
+			set mode direct
+		}
+	}
+
 	if {$mode eq "dlna"} {
 		log "  DLNA: $url" 0
 		if {[catch {exec wget -O "$tmp/$bfile" $url} msg opts]} {
@@ -104,24 +111,12 @@ proc ::decrypt::dequeue {q ts} {
 		if {$helper} { system dlnahelper -release }
 	} else {
 		log "  Direct decryption" 0
-		set keys {}
-		if {![catch {set fd [open "/mod/boot/cryptokey"]}]} {
-			set bytes [$fd read 16]
-			$fd close
-			binary scan $bytes H* key
-			if {[string length $key] == 32} {
-				lappend keys $key
-			}
-		}
-		lappend keys [string range [system nugget cryptokey -key] 0 31]
-		lappend keys [system encryptionkey]
-		foreach key $keys {
-			::auto::log "Testing key ($key)" 2
-			if {[catch {
-			    set ret [exec /mod/bin/stripts -q/ $key $rfile]
-			}]} continue
-			if {$ret eq "1"} break
+
+		set key [$ts getkey $mode]
+		if {$key eq ""} {
+			return {"FAILED" "No matching key for decryption"}
 		}
+
 		::auto::log "Using key ($key)" 2
 		if {[catch {exec /mod/bin/stripts -@ $key $rfile "$tmp/[\
 		    file rootname $bfile]" } msg opts]} {
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 6023ec14..ad11c992 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -2,6 +2,8 @@
 if {![exists -command class]} { package require oo }
 if {![exists -command pack]} { package require pack }
 if {![exists -command xconv]} { package require xconv }
+if {![exists -command binary]} { package require binary }
+
 source /mod/webif/lib/setup
 require system.class tvdb.class classdump
 
@@ -537,7 +539,7 @@ proc {ts resetnew} {dir} {
 	#hexdump $bytes
 	#puts "Calculated: $watched/$tot"
 
-	pack bytes $tot -intle 32 0 
+	pack bytes $tot -intle 32 0
 	pack bytes $watched -intle 32 32
 
 	#hexdump $bytes
@@ -773,7 +775,7 @@ ts method episode_name {} {
 			incr flag
 		}
 		if {$flag} { $self storeepisode }
-	
+
 		return $tvdb_data(name)
 	}
 
@@ -838,3 +840,56 @@ proc {ts genrelist} {} {
 	return $glist
 }
 
+# return the key that will decrypt the file in the mode, or nothing
+ts method getkey {mode} {
+	# mode: dlna (active key), direct
+
+	set rfile [file rootname $file]
+
+	set keys {}
+	# the active key
+	set key [string range [system nugget cryptokey -key] 0 31]
+	if {$key ne ""} {
+		lappend keys $key
+	}
+	if { $mode ne "dlna" } {
+		# also try other keys, such as this - same as active?
+		try {
+			set fd [open "/mod/boot/cryptokey"]
+			set bytes [$fd read 16]
+			binary scan $bytes H* key
+			if {[string length $key] == 32} {
+				ladd keys $key
+			}
+		} finally {
+			catch {$fd close}
+		}
+
+		# the native key
+		if {![catch {set key [system encryptionkey]}]} {
+			ladd keys $key
+		}
+
+		# support a file listing other keys in hex, one-per-line
+		# eg, for recordings imported from a broken box
+		try {
+			set fd [open "/mod/etc/keys" r]
+			foreach key [split [$fd read -nonewline] "\n"] {
+				ladd keys $key
+			}
+		} finally {
+			catch {$fd close}
+		}
+	}
+
+	foreach key $keys {
+		if {[catch {
+			set ret [exec /mod/bin/stripts -q/ $key $rfile]
+		}]} continue
+		if {$ret eq "1"} {
+			return $key
+		}
+	}
+	return
+}
+

From 6c3c1f3423d669edfc61f3306bb8a25ea76300bb Mon Sep 17 00:00:00 2001
From: MymsMan <bobbuxton@gmail.com>
Date: Wed, 20 Jan 2021 16:11:59 +0000
Subject: [PATCH 57/91] Restrict matching epsiodes search to same channel

---
 webif/lib/rsv.class | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index b18090b3..46feca8d 100644
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -970,6 +970,7 @@ proc {rsv construct} {event type} {
 		set now [clock seconds]
 		set progs [lmap i [\
 		    epg dbfetch dump -scrid [$event get series_crid]  \
+		    -service [$event get service_id] \
 		    -sort start] {
 			if {[set ecrid [$i get event_crid]] eq ""} continue
 

From 0e66340b42004d0291516abc0278ee7846124613 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Wed, 24 Feb 2021 13:21:19 +0000
Subject: [PATCH 58/91] Fix problems pointed out by tclCheck and frink

---
 webif/html/browse/index.jim | 2 +-
 webif/html/xepg/index.jim   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 6351ab57..be17858b 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -365,7 +365,7 @@ foreach sl $sortlist {
 
 	set tag " (current)"
 	if {$order != $index} {
-		set qs [regsub -all {&order=[[[:digit:]]+} $env(QUERY_STRING) ""]
+		set qs [regsub -all {&order=[[:digit:]]+} $env(QUERY_STRING) ""]
 		puts "<a href=\"$env(SCRIPT_NAME)?$qs&order=$index\" title=\"$tt\">"
 		set tag ""
 		set ket "a"
diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim
index fef0fd5b..0e1e3733 100755
--- a/webif/html/xepg/index.jim
+++ b/webif/html/xepg/index.jim
@@ -270,7 +270,7 @@ foreach e $records {
 	set txt [list [cgi_quote_html [$e get name]] "([\
 	    clock format $es -format "%H:%M"] - [\
 	    clock format $ee -format "%H:%M"])[\
-	    expr {$showing? " ($perc%)": ""}]"]
+	    expr {$showing ? " ($perc%)" : ""}]"]
 
 	if {$es < $stt} { set es $stt }
 	if {$ee > $ett} { set ee $ett }

From 08ec7643f7e3bb512337e25d3516c0feb366c457 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Tue, 10 Nov 2020 14:04:20 +0000
Subject: [PATCH 59/91] Add thumbnail viewer to Manage Bookmarks

---
 webif/html/browse/bookmarks/index.jim |  21 ++--
 webif/html/browse/bookmarks/script.js | 143 ++++++++++++++------------
 2 files changed, 91 insertions(+), 73 deletions(-)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index 06d3542c..b69350c4 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -45,18 +45,23 @@ var dir = '$dir';
 </td><td><div id=slider></div></td></tr>
 <tr><td align=right>
 <span class=left>Current: <span id=curbmk></span></span><br><br><br>
-<button id=genthumbs title=\"Generate Thumbnails\" class=left>Generate Thumbnails</button>
+<button id=genthumbs title=\"Generate Thumbnails\"
+    class=left>Generate Thumbnails</button>
 </td><td>
 <div id=thumbs class=hidden>
-<table><tr>"
+<table><tr>
+"
 set times {}
 loop v $start $limit $incr {
-    lappend times $v
-    puts "<th style=\"text-align: center\"><span class=mark>[format "%+d" $v]</span>s</th>"
+	lappend times $v
+	puts "
+		<th style=\"text-align: center\"><span class=mark>
+		[format "%+d" $v]</span>s</th>
+	"
 }
 puts "</tr><tr>"
 foreach v $times {
-    puts "<td><img class=bmp src=/img/generating.png pos=$v></td>"
+	puts "<td><img class=bmp src=/img/generating.png pos=$v></td>"
 }
 puts "
 </tr></table>
@@ -64,10 +69,10 @@ puts "
 </table>
 <div id=buttons>
 <button id=save>Save Bookmarks</button>
-<button id=back>Back to Media Browser</button>"
+<button id=back>Back to Media Browser</button>
+"
 if {[system pkginst nicesplice]} {
-    puts "
-<button id=crop>Go to Crop</button>"
+	puts "<button id=crop>Go to Crop</button>"
 }
 puts "
 </div>
diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index f5da93c4..dd28f8e4 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -1,13 +1,15 @@
 var curval = 0;
 var $slider;
 var values;
- 
-function toTimeStr(tval) {
+
+function
+toTimeStr(tval)
+{
 	return new Date(null, null, null, null, null, tval)
- 		.toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' ';
+	    .toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' ';
 }
 
-function 
+function
 valarray(valstr)
 {
 	return valstr.trim().split(/ +/);
@@ -76,39 +78,42 @@ draw_slider()
 };
 
 function
-regenthumbs(curbmkstr) {
+regenthumbs(curbmkstr)
+{
 	$('#curbmk').html(curbmkstr);
 	$('#thumbs').hide();
 	$('#genthumbs')
-		.button('enable')
-		.button('option', 'icon', 'ui-icon-zoomin');
+	    .button('enable')
+	    .button('option', 'icon', 'ui-icon-zoomin');
 }
 
-function 
-update_slider() {
+function
+update_slider()
+{
 	setvals();
-		
+
 	/* slider values are strings */
 	var curvalstr = "" + curval;
 	if (!values.includes(curvalstr)) {
 		/* try to map current selected bmk to new bmk */
-		var ovalues = $slider.slider( "option", "values" );
+		var ovalues = $slider.slider("option", "values");
 		var nn = ovalues.indexOf(curvalstr);
 		if (nn < 0) {
 			curval = 0;
 		} else {
-			if (nn >= values.length) nn = values.length - 1;
-			curval = nn >= 0? values[nn]: 0;
+			if (nn >= values.length)
+			    nn = values.length - 1;
+			curval = nn >= 0 ? values[nn] : 0;
 		}
 		regenthumbs(toTimeStr(curval));
 	}
-	$('#slider .ui-slider-handle').each( function(i) {
-		if (i >= values.length) 
+	$('#slider .ui-slider-handle').each(function(i) {
+		if (i >= values.length)
 			$(this).hide();
 		else
 			$(this).show();
-		});
-	$slider.slider( "option", "values", values );
+	});
+	$slider.slider("option", "values", values);
 };
 
 function
@@ -120,7 +125,7 @@ refreshtimes()
 		$.each(values, function(k, v) {
 			t += toTimeStr(v);
 		});
-		$('#slider .ui-slider-handle').each( function(i) {
+		$('#slider .ui-slider-handle').each(function(i) {
 			$(this).attr('title', toTimeStr(values[i]));
 		});
 	}
@@ -130,7 +135,7 @@ refreshtimes()
 function
 sortmarks()
 {
-	values.sort(function(a, b){return a-b});
+	values.sort(function(a, b){return a - b});
 	$('#bookmarks').val(values.join(" "));
 }
 
@@ -142,18 +147,18 @@ $('#curbmk').html(toTimeStr(curval));
 
 $('#addbmark').button({icons: {primary: "ui-icon-plus"}, text: false})
     .on('click', function() {
-		$('#bookmarks').val('0 ' + $('#bookmarks').val());
-		curval = 0;
-		update_slider();
+	$('#bookmarks').val('0 ' + $('#bookmarks').val());
+	curval = 0;
+	update_slider();
 });
 
 $('#delbmark').button({icons: {primary: "ui-icon-minus"}, text: false})
     .on('click', function() {
-		var cur = $('#bookmarks').val();
-		cur = cur.replace(
-			new RegExp('(^| )' + curval + '( |$)', ''), ' ').trim();
-		$('#bookmarks').val(cur);
-		update_slider();
+	var cur = $('#bookmarks').val();
+	cur = cur.replace(
+	    new RegExp('(^| )' + curval + '( |$)', ''), ' ').trim();
+	$('#bookmarks').val(cur);
+	update_slider();
 });
 
 $('#save').button({icons: {primary: "ui-icon-disk"}})
@@ -178,54 +183,62 @@ $('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
 			window.location.href.replace('/bookmarks/?','/crop/crop.jim?');
 });
 
+$('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
+    .on('click', function() {
+	window.location =
+	    window.location.href.replace('/bookmarks/?','/crop/crop.jim?');
+});
+
 $('#update').button()
     .on('click', function() {
-		update_slider();
+	update_slider();
 });
 
 $('#slider')
-	.on('slidechange', function(evt, ui) {
-		var tstr = toTimeStr(curval);
-		if (tstr != $('#curbmk').html()) {
-			regenthumbs(tstr);
-		}
+    .on('slidechange', function(evt, ui) {
+	var tstr = toTimeStr(curval);
+	if (tstr != $('#curbmk').html())
+		regenthumbs(tstr);
 });
 
-$('#genthumbs').button( { icons: {primary: "ui-icon-zoomin"}, disabled: false } )
-	.on('click', function() {
-		var start;
-		var incr = -1;
-		var last;
-		$(this)
-			.button('disable')
-			.button('option', 'icon', 'ui-icon-refresh');
-		$('img.bmp').each(function(i) {
-			if (start === undefined) {
-				start = $(this).attr('pos')|0;
-			} else {
-				last = $(this).attr('pos')|0;
-			}
-			incr++;
-		});
+$('#genthumbs').button({icons: {primary: "ui-icon-zoomin"}, disabled: false})
+    .on('click', function() {
+	var start;
+	var incr = -1;
+	var last;
+	$(this)
+	    .button('disable')
+	    .button('option', 'icon', 'ui-icon-refresh');
+	$('img.bmp').each(function(i) {
+		if (start === undefined) {
+			start = $(this).attr('pos') | 0;
+		} else {
+			last = $(this).attr('pos') | 0;
+		}
+		incr++;
+	});
+
 	incr = (last - start) / incr;
 
-	$.get('/browse/thumbnail/mkrange.jim',
-		{
-			'file': file,
-			's':    start+curval,
-			'e':    last+curval,
-			'i':    incr
-		}, function() {
-			$('#thumbs').show();
-			$('img.bmp').each(function(i) {
-				/* cast to "int" */
-				var pos = $(this).attr('pos')|0;
-				$(this).attr('src',
-					'/browse/thumbnail/fetch.jim?file=' +
-					encodeURIComponent(file) + '&pos=' + (curval+pos).toFixed(1));
-				});
-			$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
+	$.get('/browse/thumbnail/mkrange.jim', {
+		'file': file,
+		's':    start+curval,
+		'e':    last+curval,
+		'i':    incr
+	}, function() {
+		$('#thumbs').show();
+		$('img.bmp').each(function(i) {
+			/* cast to "int" */
+			var pos = $(this).attr('pos')|0;
+			$(this).attr('src',
+			    '/browse/thumbnail/fetch.jim?' +
+			    'file=' + encodeURIComponent(file) +
+			    '&pos=' + (curval+pos).toFixed(1));
 		});
+		$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
+	});
+
+});
 
 });
 

From 318d088fff1a6493f529c5c31c32ac0067980cc7 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 1 Jan 2021 23:57:54 +0000
Subject: [PATCH 60/91] Support setting the seriesnum, episodenum, episodetot
 attributes in "rename"

---
 webif/html/browse/assets.jim   | 35 ++++++++++++++++++++++++++--
 webif/html/browse/epgtitle.jim |  5 +++-
 webif/html/browse/rename.jim   | 42 ++++++++++++++++++++++++++++++++--
 webif/html/browse/script.js    |  7 ++++--
 webif/html/browse/style.css    |  5 ++++
 5 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/webif/html/browse/assets.jim b/webif/html/browse/assets.jim
index 8735f9ab..0fc652b2 100755
--- a/webif/html/browse/assets.jim
+++ b/webif/html/browse/assets.jim
@@ -103,7 +103,7 @@ if {[llength $plugins(dmenu)]} {
 	}
 }
 
-# the maxlength values for title and synopsis are 1 less than the maximum to 
+# the maxlength values for title and synopsis are 1 less than the maximum to
 # allow for an extra byte to indicate character encoding (see rename.jim)
 puts {
 </ul>
@@ -138,13 +138,44 @@ puts {
 	</td>
 	</tr>
 
+	<tr style="display: none" class=tstype>
+	<th>
+		<label for="rename_seriesnum" style="padding-top: 0.5em">
+			<b>New Series Number</b>
+		</label>
+	</th>
+	<td>
+		<span title="Series number">
+		<input type=number name="rename_seriesnum" id="rename_seriesnum"
+		    value=0 max=255
+		    class="uint8_t ui-widget-content ui-corner-all">
+		</span>
+		 <label for="rename_episodenum" style="padding-top: 0.5em">
+		        <b>Episode</b>
+		</label>
+		<span title="Episode number">
+		<input type=number name="rename_episodenum"
+		    id="rename_episodenum" value=0 max=255
+		    class="uint8_t ui-widget-content ui-corner-all">
+		</span>
+		  <label for="rename_episodetot" style="padding-top: 0.5em">
+		          <b>of</b>
+		  </label>
+		<span title="Episode total">
+		<input type=number name="rename_episodetot"
+		    id="rename_episodetot" value=0 max=255
+		    class="uint8_t ui-widget-content ui-corner-all">
+		</span>
+	</td>
+	</tr>
+
 	<tr style="display: none" class=tstype>
 	<th>
 		<label for="rename_synopsis" style="padding-top: 0.5em">
 			<b>New Synopsis</b>
 		</label>
 	</th>
-	<td>
+	<td colspan=3>
 		<textarea name="rename_synopsis" id="rename_synopsis"
 		    value="" cols=70 rows=4 maxlength=251
 		    class="text ui-widget-content ui-corner-all"></textarea>
diff --git a/webif/html/browse/epgtitle.jim b/webif/html/browse/epgtitle.jim
index 36c1c4ae..7cdfbcdd 100755
--- a/webif/html/browse/epgtitle.jim
+++ b/webif/html/browse/epgtitle.jim
@@ -14,6 +14,9 @@ puts "{"
 puts "\"title\" : \"[jescape [$ts get title]]\","
 puts "\"synopsis\" : \"[jescape [$ts get synopsis]]\","
 puts "\"guidance\" : \"[jescape [$ts get guidance]]\","
-puts "\"genre\" : [jescape [$ts genrenib]]"
+puts "\"genre\" : [jescape [$ts genrenib]],"
+puts "\"seriesnum\" : [jescape [$ts get seriesnum]],"
+puts "\"episodenum\" : [jescape [$ts get episodenum]],"
+puts "\"episodetot\" : [jescape [$ts get episodetot]]"
 puts "}"
 
diff --git a/webif/html/browse/rename.jim b/webif/html/browse/rename.jim
index 1e3a07ae..c141ae70 100755
--- a/webif/html/browse/rename.jim
+++ b/webif/html/browse/rename.jim
@@ -30,8 +30,7 @@ if {[file isdirectory $file]} {
 				set new "\025$new"
 			}
 			if {$new ne $old} {
-				if {$attr eq "guidance" ||
-				    [string length $new] > 0} {
+				if {$attr eq guidance || $new ne ""} {
 					$ts set$attr $new
 				}
 			}
@@ -39,6 +38,45 @@ if {[file isdirectory $file]} {
 			puts "$attr: $msg"
 		}
 	}
+	# deal with series number/ep num/ep total, which get set together
+	# list the old values seen in case a later one is changed
+	set epdataold {}
+	# list values to be set, or {}
+	set epdatanew {}
+	foreach attr {seriesnum episodenum episodetot} {
+		if {[catch {
+			set new [string map {"\n" ""} [
+			    string trim [cgi_get "rename_$attr"]]]
+			set old [$ts get $attr]
+			if {$new ne $old} {
+				switch $attr {
+					seriesnum {
+						set epdatanew [list $new]
+					}
+					episodenum -
+					episodetot {
+						if {$epdatanew eq {}} {
+						    set epdatanew $epdataold
+						}
+						lappend epdatanew $new
+					}
+				}
+			} elseif {$epdatanew eq {}} {
+				# nothing to be changed yet
+				lappend epdataold $old
+			} else {
+				# fill to-be-set list with old value
+				lappend epdatanew $old
+			}
+		} msg]} {
+			puts "$attr: $msg"
+		}
+	}
+	if {$epdatanew ne {}} {
+		if {[catch {$ts storeepisode $epdatanew} msg]} {
+                        puts "ts::storeepisode: $msg"
+                }
+	}
 
 	if {"$dir/$newfile.ts" ne "$file"} { ts renamegroup $file $newfile }
 } else {
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index cec02bb3..d0548bea 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -105,6 +105,9 @@ function epginfo_callback(data, status, xhr)
 	$('#rename_synopsis').val(data.synopsis);
 	$('#rename_guidance').val(data.guidance);
 	$('#rename_genre').val(data.genre);
+	$('#rename_seriesnum').val(data.seriesnum);
+	$('#rename_episodenum').val(data.episodenum);
+	$('#rename_episodetot').val(data.episodetot);
 
 	$('tr.tstype').show('slow');
 }
@@ -113,11 +116,11 @@ function insert_folder_size(folder, size)
 {
 	// folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	// ID of size element is ID + RFC4648 s5 encoding of folder name
-	folder = "ID" + 
+	folder = "ID" +
              btoa(escape(folder))
                      .replace(/\+/g, '-')
                      .replace(/\//g, '_')
-                     .replace(/=/g, '');	
+                     .replace(/=/g, '');
 	//console.log("Folder: (%s) = (%s)", folder, size);
 	if (size.search(/\d$/) == -1)
 		size += 'iB';
diff --git a/webif/html/browse/style.css b/webif/html/browse/style.css
index a299b79d..d2e2fa38 100644
--- a/webif/html/browse/style.css
+++ b/webif/html/browse/style.css
@@ -30,3 +30,8 @@ img.qb
 	color: #ff4000;
 }
 
+input.uint8_t
+{
+	width: 6ch;
+}
+

From afee47b6bcc8dcab61da3ce1470c471c1679068a Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 22 Oct 2020 11:39:37 +0000
Subject: [PATCH 61/91] Improve status, adding more possible outputs

 - check for copying vs playing: the same file.ext is open twice
 - check for playing DLNA: localhost:n->host:9000
 - on HDR, distinguish Playing a show vs streaming it over DLNA
 - distinguish between Watching, Watching (delayed) (timeshift),
   and Not Watching (eg Portal).
---
 webif/cgi-bin/status.jim | 147 +++++++++++++++++++++++++++------------
 webif/lib/system.class   |  19 ++++-
 2 files changed, 119 insertions(+), 47 deletions(-)

diff --git a/webif/cgi-bin/status.jim b/webif/cgi-bin/status.jim
index 45db75e2..f1e92eb9 100755
--- a/webif/cgi-bin/status.jim
+++ b/webif/cgi-bin/status.jim
@@ -7,7 +7,7 @@ require system.class epg.class rsv.class svc.class plugin
 set runmode cli
 if {[string match {*jim} $argv0]} { set runmode cgi }
 
-set schedtime 1200 
+set schedtime 1200
 switch $runmode {
     cgi {
 	set type [cgi_get type "full"]
@@ -15,8 +15,7 @@ switch $runmode {
     }
     cli {
 	set type "full"
-	if {"-X" in $argv} { set schedtime 7200 }
-	if {"-x" in $argv} { set schedtime 7200 }
+	if {[lsearch -nocase $argv "-x"] >= 0} { set schedtime 7200 }
     }
 }
 
@@ -61,11 +60,11 @@ proc register_statusop {op name icon} {
 eval_plugins status 1
 
 proc get_data {} {
-	global pid exts
+	global pid exts stream tsr tsrcnt
 
 	set ret {}
 	if {[catch {set data \
-	    [exec /mod/webif/lib/bin/lsof -X -Fns -p $pid]} msg]} {
+	    [exec /mod/webif/lib/bin/lsof -Fnsa -p $pid]} msg]} {
 		debug "Error: $msg"
 		set ret {}
 	} else {
@@ -73,35 +72,64 @@ proc get_data {} {
 		foreach line [split $data "\n"] {
 			set typ [string index $line 0]
 			switch $typ {
+			    a {
+				set access [string index $line 1]
+			    }
 			    s {
 				set size [string range $line 1 end]
 			    }
 			    n {
-				if {[string first Video/ $line] == -1 && \
-				    [string first /media/ $line] == -1} {
+				# strip initial n and trailing " (...)" if
+				# present
+				regsub -all -- {(^n)|( \([^\)]+\)$)} \
+				    $line "" line
+				set file [subst -nocommands -novariables $line]
+				set ext [file extension $line]
+				# Note but skip TSR buffers
+				if {[file rootname $file] eq $tsr} {
+					if {$ext eq ".nts"} {
+						incr tsrcnt
+					}
 					continue
 				}
-				regsub -- { \([^\)]+\)$} $line "" line
-				set ext [file extension $line]
-				if {$ext ni $exts} continue
-				set file [subst -nocommands -novariables \
-				    [string range $line 1 end]]
-				# Skip HD-Fox TSR buffer
-				if {$file eq "/media/drive1/.tsr/0.ts"} {
+
+				if {[string first Video/ $line] >= 0 ||
+				    [string first /media/ $line] >= 0} {
+					if {$ext ni $exts} {
+						continue
+					}
+				} elseif {[string first $line /] >= 0} {
+					# fast skip other files
+					continue
+				} elseif {[regexp -- {[A-Za-z0-9._-]+:([0-9]+)->([A-Za-z0-9._-]+):([0-9]+)} $line _ sprt host dprt]} {
+					if {$sprt == 9000} {
+						incr stream
+						continue
+					} elseif {$dprt == 9000} {
+						set file [\
+						    format "DLNA from %s" $host]
+						set size 0
+						set ext ""
+					} else {
+						continue
+					}
+				} else {
 					continue
 				}
 				# Handle chase play (same file open twice
 				# and recently written)
-				if {[dict exists $ret $file] && \
+				if {[dict exists $ret $file] &&
 				    $ext eq ".ts"} {
-					set age [expr [clock seconds] - \
-					    [file mtime $file]]
+					set age [expr [clock seconds] \
+					    - [file mtime $file]]
 					if {$age < 60} {
-						set ret($file) -1
+						set access [lindex \
+						    [dict get $ret $file] 1]
+						set ret($file) [list -1 $access]
 					}
-				} else  {
-					debug "$file = $size"
-					set ret($file) $size
+				} else {
+					debug "$file = $size,$access"
+					set ret($file) [list $size $access]
 				}
 			    }
 			}
@@ -109,11 +137,9 @@ proc get_data {} {
 	}
 	foreach file [dict keys $::ops] {
 		if {![dict exists $ret $file]} {
-			if {[file exists $file]} {
-				set ret($file) [file size $file]
-			} else {
-				set ret($file) 0
-			}
+			set sz 0
+			if {[file exists $file]} { set sz [file size $file] }
+			set ret($file) [list $sz u]
 		}
 	}
 	return $ret
@@ -139,9 +165,12 @@ proc add_output {icon mode name} {
 
 set play 0
 set rec 0
+set stream 0
 set output {}
 set ops {}
 set model [system model]
+set tsr [file rootname [system tsr]]
+set tsrcnt 0
 
 foreach opfile [glob -nocomplain -directory /tmp -tails -- ".bgop.*"] {
 	set op [string range $opfile 6 end]
@@ -179,8 +208,9 @@ if {[llength $data]} {
 		debug " NDATA: ($ndata)"
 		set rr 0
 	}
+	set bnames [lsort [lmap x [array names data] { file tail $x }]]
 	foreach file [array names data] {
-		set bname [file rootname [file tail $file]]
+		set bname [file tail $file]
 
 		set name [string map {
 			"/mnt/hd2/My Video/" ""
@@ -189,17 +219,22 @@ if {[llength $data]} {
 			".ts" ""
 		} $file]
 
-		if {$data($file) == -1} {
+		if {[lindex $data($file) 0] == -1} {
 			set mode chase
 		} elseif {$rr} {
 			if {$file in $recs} {
 				set mode rec
+			} elseif {[llength [\
+			    lsearch -all $bnames $bname]] == 2} {
+				# two different files having same file.ext open
+				set mode copy
 			} else {
 				set mode play
 			}
 		} else {
 			if {![dict exists $ndata $file]} continue
-			if {$ndata($file) > $data($file)} {
+			if {[lindex $ndata($file) 0] > \
+			    [lindex $data($file) 0]} {
 				set mode rec
 			} else {
 				set mode play
@@ -231,8 +266,20 @@ if {[llength $data]} {
 			}
 			play {
 				incr play
-				set mode "Playing"
-				set icon "745_1_10_Video_2Live.png"
+				if {$play > $stream} {
+					set mode "Playing"
+					set icon "745_1_10_Video_2Live.png"
+				} else {
+					set mode "Streaming"
+					set icon "/img/dlna.png"
+				}
+			}
+			copy {
+				if {[lindex $data($file) 1] ne "r"} {
+					continue
+				}
+				set mode "Copying"
+				set icon "/img/dlna.png"
 			}
 			default {
 				if {[dict exists $statusops $mode]} {
@@ -272,23 +319,33 @@ if {![system instandby] && $play < 1} {
 		if {[llength $epgs] == 1} {
 			lassign $epgs epg
 			set prog "- [$epg get name] ("
-			append prog "[clock format [$epg get start] -format %H:%M] - "
-			append prog "[clock format $([$epg get start] + [$epg get duration]) -format %H:%M]"
+			append prog "[clock format [\
+			    $epg get start] -format %H:%M] - "
+			append prog "[clock format $([$epg get start] \
+			    + [$epg get duration]) -format %H:%M]"
 			append prog ") \[[$epg percent]%\]"
 		}
 
-		if {$runmode eq "cgi"} {
-			set s "
-			    <span class=\"va stitem\">
-			     [epg channelicon $name 30 \
-			        {vertical-align: middle; padding: 0 4px 0 2px}]
-			    <span>Watching <i>$lcn: $name $prog</i></span>
-			"
-			append s "</span>"
-			lappend output $s
+		# 0 => no TSR; >=2 => TSR
+		if {$tsrcnt == 0 || $tsrcnt == 2} {
+			set s "Watching"
+		} elseif {$tsrcnt == 3} {
+			set s "Watching (delayed)"
 		} else {
-			set s "Watching $lcn: $name $prog"
-			lappend output $s
+			debug "tsrcnt=$tsrcnt"
+			set s "Not watching"
+		}
+		if {$runmode eq "cgi"} {
+			lappend output [format "
+			    <span class=\"va stitem\">
+			     [epg channelicon %s 30 \
+			        {vertical-align: middle; padding: 0 4px 0 2px}]
+			    <span>%s <i>%s: %s %s</i></span>
+				</span>
+			" $name $s $lcn $name $prog]
+		} else {
+			lappend output [format "%s %s: %s %s" \
+			    $s $lcn $name $prog]
 		}
 	}
 }
@@ -314,7 +371,7 @@ if {[system instandby]} {
 # Upcoming recordings
 
 set events [rsv list tbl_reservation \
-    " where ersvtype = 3 and nsttime - [clock seconds] < $schedtime 
+    " where ersvtype = 3 and nsttime - [clock seconds] < $schedtime
       and nsttime > [clock seconds] "]
 foreach event $events {
 	if {$runmode eq "cgi"} {
diff --git a/webif/lib/system.class b/webif/lib/system.class
index d67cca76..e0ffb9aa 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -398,6 +398,22 @@ proc {system disktemp} {} {
 	return $($temp + 0)
 }
 
+proc {system tsrdir} {} {
+	switch [system model] {
+		HDR {
+			set tsrdir "/mnt/hd2/Tsr"
+		}
+		HD {
+			set tsrdir "/media/drive1/.tsr"
+		}
+	}
+	return $tsrdir
+}
+
+proc {system tsr} {} {
+	return [file join [system tsrdir] "0.ts"]
+}
+
 require pretty_size
 
 proc {system diskspace} {{raw 0}} {
@@ -412,13 +428,12 @@ proc {system diskspace} {{raw 0}} {
 	set perc $($used * 100 / $size)
 	set fperc $(100 - $perc)
 
+	set tsrdir [system tsrdir]
 	switch [system model] {
 		HDR {
-			set tsrdir "/mnt/hd2/Tsr"
 			set tsrok [file isdirectory $tsrdir]
 		}
 		HD {
-			set tsrdir "/media/drive1/.tsr"
 			set tsrok [file exists "$tsrdir/0.ts"]
 		}
 	}

From 8347713f552a22ba07059ce6626b6812bf81c6d0 Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Wed, 24 Feb 2021 14:44:55 +0000
Subject: [PATCH 62/91] Fix overflowing conflict warning

---
 webif/cgi-bin/epg/info.jim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/cgi-bin/epg/info.jim b/webif/cgi-bin/epg/info.jim
index 31bbac70..713a2acb 100755
--- a/webif/cgi-bin/epg/info.jim
+++ b/webif/cgi-bin/epg/info.jim
@@ -31,7 +31,7 @@ if {[$record get sched_type] < 1} {
 	    [system tuners]]
 	if {[llength $conflicts]} {
 		puts {
-<div class=warningbox style="width: 100%; margin: 0.2em"><div>
+<div class=warningbox style="width: auto; margin: 0.2em"><div>
 This event conflicts with the following items in your scheduled recording list.
 <ul>
 		}

From 710162a654aff17caea1d2b69f2525f16f086661 Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Wed, 24 Feb 2021 14:46:37 +0000
Subject: [PATCH 63/91] Fix crash when genre is null

---
 webif/lib/ts.class | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index ad11c992..6eb0b518 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -817,7 +817,8 @@ ts method tsr {} {
 }
 
 ts method genrenib {} {
-	return $($genre >> 4)
+	if {[catch {set v $($genre >> 4)}]} { set v 0 }
+	return $v
 }
 
 ts method genre_info {} {

From cdeea09dab45cb69db56f7f5e9c72f108a8ddd5d Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Wed, 24 Feb 2021 14:47:11 +0000
Subject: [PATCH 64/91] Work around uclibc getaddrinfo()

---
 webif/lib/pkg.class | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webif/lib/pkg.class b/webif/lib/pkg.class
index 0cee5258..c2805333 100755
--- a/webif/lib/pkg.class
+++ b/webif/lib/pkg.class
@@ -128,7 +128,7 @@ pkg method loadraw {} {
 	} else {
 		set data [exec /bin/opkg info $name]
 	}
-	
+
 	foreach line [split $data "\n"] {
 		if {$tag ne "" && [string match { *} $line]} {
 			append raw($tag) $line
@@ -225,7 +225,7 @@ proc {pkg loaddiagmeta} {} {
 }
 
 proc {pkg fetchfile} {url} {
-	set f [socket stream hpkg.tv:80]
+	set f [socket stream hpkg.tv:http]
 	$f puts -nonewline "GET /hdrfoxt2/$url HTTP/1.1\r\n"
 	$f puts -nonewline "Host: hpkg.tv\r\n"
 	$f puts -nonewline "Connection: close\r\n"
@@ -237,7 +237,7 @@ proc {pkg fetchfile} {url} {
 		#puts "Web Header: $line"
 		set line [string trim [$f gets]]
 	}
-	
+
 	# Save the body
 	set ret [$f read]
 	$f close

From 599bb9b5bc9e74d385c244443f82f23cecdf7573 Mon Sep 17 00:00:00 2001
From: MymsMan <mymsman@noreply.hummy.tv>
Date: Wed, 24 Feb 2021 14:54:59 +0000
Subject: [PATCH 65/91] Move favicon.ico to prevent errors during install

---
 webif/html/favicon.ico | Bin 19 -> 10307 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 120000 => 100644 webif/html/favicon.ico

diff --git a/webif/html/favicon.ico b/webif/html/favicon.ico
deleted file mode 120000
index faea57c7..00000000
--- a/webif/html/favicon.ico
+++ /dev/null
@@ -1 +0,0 @@
-img/fav/favicon.ico
\ No newline at end of file
diff --git a/webif/html/favicon.ico b/webif/html/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a04f37cbda5d07372471ca81e7bc9566656bd1df
GIT binary patch
literal 10307
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
X%J@r`T{n@Rb-+;9Oy{nad&2(#Ivs~&

literal 0
HcmV?d00001


From 4b925199e5274947931b21ae6903193fc43382a0 Mon Sep 17 00:00:00 2001
From: prpr <prpr@noreply.hummy.tv>
Date: Wed, 24 Feb 2021 15:13:35 +0000
Subject: [PATCH 66/91] Add Failed and Pending select buttons, reorder buttons

---
 webif/html/diag/queue/index.jim | 10 +++++++---
 webif/html/diag/queue/script.js | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/webif/html/diag/queue/index.jim b/webif/html/diag/queue/index.jim
index e66e6caf..0f6f7d00 100755
--- a/webif/html/diag/queue/index.jim
+++ b/webif/html/diag/queue/index.jim
@@ -46,12 +46,16 @@ There are no tasks in the queue.
 </tbody>
 </table>
 <div class=buttonbar>
+<button id=selcomplete class=needsdata>Select Completed</button>
+<button id=selfailed class=needsdata>Select Failed</button>
+<button id=selpending class=needsdata>Select Pending</button>
+<button id=selall class=needsdata>Select All</button>
+<button id=selnone class=needsdata>Select None</button>
+</div>
+<div class=buttonbar>
 <button id=qdelete act=delete class="submit needssel">Delete</button>
 <button id=qresubmit act=resubmit class="submit needssel">Re-submit</button>
 <button id=qhold act=hold class="submit needssel">Hold</button>
-<button id=selcomplete class=needsdata>Select Completed</button>
-<button id=selall class=needsdata>Select All</button>
-<button id=selnone class=needsdata>Select None</button>
 <button class=refresh id=refresh>Refresh</button>
 <span class=isloading><img src=/img/spin.gif></span>
 </div>
diff --git a/webif/html/diag/queue/script.js b/webif/html/diag/queue/script.js
index 93c83b06..c23e1654 100644
--- a/webif/html/diag/queue/script.js
+++ b/webif/html/diag/queue/script.js
@@ -163,6 +163,18 @@ $('#selall').button({icons:{primary:"ui-icon-star"}})
 	$('#queuetab input:checkbox').prop('checked', true).trigger('change');
 });
 
+$('#selpending').button({icons:{primary:"ui-icon-check"}})
+    .on('click', function() {
+        $('#queuetab input:checkbox[status="PENDING"]').prop('checked', true)
+            .trigger('change');
+});
+
+$('#selfailed').button({icons:{primary:"ui-icon-check"}})
+    .on('click', function() {
+        $('#queuetab input:checkbox[status="FAILED"]').prop('checked', true)
+            .trigger('change');
+});
+
 $('#selcomplete').button({icons:{primary:"ui-icon-check"}})
     .on('click', function() {
 	$('#queuetab input:checkbox[status="COMPLETE"]').prop('checked', true)

From 3a1d398874dce647ed580d7dc31a39306fd1aa08 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Wed, 24 Feb 2021 15:06:07 +0000
Subject: [PATCH 67/91] Add option to automatically remove unused dependency
 packages

---
 webif/cgi-bin/opkg.jim                             | 7 ++++++-
 webif/html/settings/modules/advanced/init.hook     | 2 ++
 webif/html/settings/modules/advanced/settings.hook | 3 +++
 webif/lib/settings.class                           | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/webif/cgi-bin/opkg.jim b/webif/cgi-bin/opkg.jim
index ca776d0a..fc1ff8f6 100755
--- a/webif/cgi-bin/opkg.jim
+++ b/webif/cgi-bin/opkg.jim
@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require pkg.class system.class
+require pkg.class system.class settings.class
 
 cgi_input
 #cgi_dump
@@ -61,6 +61,11 @@ if {$cmd eq "dependinfo"} {
 }
 
 if {$cmd eq "upgrade"} { opkg update }
+
+if {$cmd eq "remove" && [[settings] noautoremove] ne "1"} {
+	append cmd " --autoremove"
+}
+
 opkg "$cmd $cmdargs"
 
 if {$cmd eq "update" || $cmd eq "upgrade"} {
diff --git a/webif/html/settings/modules/advanced/init.hook b/webif/html/settings/modules/advanced/init.hook
index 9cf79eb9..abecda1c 100644
--- a/webif/html/settings/modules/advanced/init.hook
+++ b/webif/html/settings/modules/advanced/init.hook
@@ -28,6 +28,7 @@ if {[cgi_get act] eq "cryptokey"} {
 
 set pkgdev [$settings pkgdev]
 set rtschedule [$settings rtschedule]
+set noautoremove [$settings noautoremove]
 set logsize [$settings logsize]
 set logkeep [$settings logkeep]
 set logage [$settings logage]
@@ -44,6 +45,7 @@ if {![catch {set ck_fd [open "/mod/boot/cryptokey"]}]} {
 
 handle_int_update pkgdev $pkgdev "Development Package Display"
 handle_int_update rtschedule $rtschedule "Real-time scheduling"
+handle_int_update noautoremove $noautoremove "Package auto-remove"
 handle_int_update logsize $logsize "Log rotation size"
 handle_int_update logkeep $logkeep "Logs to keep"
 handle_int_update logage $logage "Rotated log max age"
diff --git a/webif/html/settings/modules/advanced/settings.hook b/webif/html/settings/modules/advanced/settings.hook
index d32240ce..02d0ebea 100755
--- a/webif/html/settings/modules/advanced/settings.hook
+++ b/webif/html/settings/modules/advanced/settings.hook
@@ -16,6 +16,9 @@ if {[system nuggeted]} {
 	setting_toggle "Real-time scheduling?" "rtschedule" $rtschedule
 }
 
+setting_toggle "Automatically remove unneeded dependent packages?" \
+    "noautoremove" $(!$noautoremove) 1
+
 puts -nonewline "
 	<tr>
 	<form class=auto id=logsize method=get action=$env(SCRIPT_NAME)>
diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index 0fd81e63..59b35ef5 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -52,6 +52,7 @@ class settings {
 	logkeep		2
 	logage		0
 	rtschedule	0
+	noautoremove	0
 }
 
 proc {settings _safer_query} { queryText args } {
@@ -257,6 +258,10 @@ settings method rtschedule {{val -1}} {
 	return [$self _nval_setting rtschedule $val]
 }
 
+settings method noautoremove {{val -1}} {
+	return [$self _nval_setting noautoremove $val]
+}
+
 settings method sortorder {{val -1}} {
 	return [$self _nval_setting sortorder $val]
 }

From d4fbdd149e9e4ebcceb606703d08dddd8732085d Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Wed, 24 Feb 2021 18:03:57 +0000
Subject: [PATCH 68/91] Update version

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index 3dd73fd3..90de56e0 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9
+Version: 1.4.9-1
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From d5fd97a83a46d104fada1459ed1b125b7d1660cb Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Wed, 24 Feb 2021 18:39:47 +0000
Subject: [PATCH 69/91] Fix bookmark script.js

---
 webif/html/browse/bookmarks/script.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index dd28f8e4..2226025c 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -70,7 +70,7 @@ draw_slider()
 			var marks = '';
 			for (var i = 0; i < ui.values.length; ++i)
 				marks += ui.values[i] + ' ';
-			$('#bookmarks').val(marks.trim()));
+			$('#bookmarks').val(marks.trim());
 			setvals();
 		}
 	});
@@ -241,5 +241,3 @@ $('#genthumbs').button({icons: {primary: "ui-icon-zoomin"}, disabled: false})
 });
 
 });
-
-});

From 760f6db5605822b0647ae1f88bcc1a679ddc929f Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Fri, 26 Feb 2021 23:04:25 +0000
Subject: [PATCH 70/91] Revert "Work around uclibc getaddrinfo()"

This reverts commit f20676619144915864ec78c020bd4be55cd8f9bb.
---
 CONTROL/control     | 2 +-
 webif/lib/pkg.class | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 90de56e0..f82741c5 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-1
+Version: 1.4.9-2
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget
diff --git a/webif/lib/pkg.class b/webif/lib/pkg.class
index c2805333..2c159996 100755
--- a/webif/lib/pkg.class
+++ b/webif/lib/pkg.class
@@ -225,7 +225,7 @@ proc {pkg loaddiagmeta} {} {
 }
 
 proc {pkg fetchfile} {url} {
-	set f [socket stream hpkg.tv:http]
+	set f [socket stream hpkg.tv:80]
 	$f puts -nonewline "GET /hdrfoxt2/$url HTTP/1.1\r\n"
 	$f puts -nonewline "Host: hpkg.tv\r\n"
 	$f puts -nonewline "Connection: close\r\n"

From e4aa241351e3a4658943771305d433c9416a9a0b Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 4 Mar 2021 15:08:15 +0000
Subject: [PATCH 71/91] Make use of unique element IDs for img consistent

---
 CONTROL/control             |  2 +-
 webif/html/browse/script.js | 42 ++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index f82741c5..852869c1 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-2
+Version: 1.4.9-3
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index d0548bea..5269fa00 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -10,6 +10,18 @@ var plugins = {
 	dmenu_prepare: {}
 };
 
+// pattern matches directory path prefix
+var pathre = /.*\/|\.[^.]*$/g;
+
+// IDs of size, img elements for folders use RFC4648 s5 encoding of name
+function folderID(folder)
+{
+	return btoa(escape(folder))
+	    .replace(/\+/g, '-')
+	    .replace(/\//g, '_')
+	    .replace(/=/g, '');
+}
+
 function blockpage(msg)
 {
 	if (!msg)
@@ -115,21 +127,11 @@ function epginfo_callback(data, status, xhr)
 function insert_folder_size(folder, size)
 {
 	// folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
-	// ID of size element is ID + RFC4648 s5 encoding of folder name
-	folder = "ID" +
-             btoa(escape(folder))
-                     .replace(/\+/g, '-')
-                     .replace(/\//g, '_')
-                     .replace(/=/g, '');
+	size += (size.search(/\d$/) == -1 ? 'iB' : ' bytes');
+	folder = folderID(folder);
 	//console.log("Folder: (%s) = (%s)", folder, size);
-	if (size.search(/\d$/) == -1)
-		size += 'iB';
-	else
-		size += ' bytes';
-	if (folder == "")
-		$('#dirsize').text(' (' + size + ')');
-	else
-		$('#' + folder).text(' (' + size + ')');
+	$(folder == "" ? '#dirsize' : '#ID' + folder)
+	    .text(' (' + size + ')');
 }
 
 function folder_size_callback(data, status, xhr)
@@ -141,11 +143,9 @@ function folder_size_callback(data, status, xhr)
 
 function set_folder_new(folder, cnt)
 {
-	folder = folder.replace(/ /g, '');
-	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	//console.log("Folder: (%s) = (%s)", folder, cnt);
 	left = cnt > 99 ? 11 : (cnt > 9 ? 14 : 17);
-	$('#img' + folder)
+	$('#img' + folderID(folder))
 	    .attr('src', '/img/Folder_New.png')
 	    .next('span.foldernum')
 	    .css('left', left + 'px')
@@ -164,10 +164,8 @@ function new_folder_callback(data, status, xhr)
 
 function set_folder__(folder)
 {
-	folder = folder.replace(/ /g, '');
-	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	//console.log("Folder: (%s)", folder);
-	$('#img' + folder + ' ~ span.folderu').show();
+	$('#img' + folderID(folder) + ' ~ span.folderu').show();
 }
 
 function __folder_callback(data, status, xhr)
@@ -264,7 +262,7 @@ var $confirm;	// Populated after DOM is loaded.
 
 function confirm_action(action, callback, file, type, id)
 {
-	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	var bfile = file.replace(pathre, '');
 	$confirm.dialog('option', 'buttons', {
 		'Yes': function() { $(this).dialog('close');
 			callback(file, type, id); },
@@ -437,7 +435,7 @@ var menuclick = function(action, el, pos)
 {
 	var file = $(el).parent().prevAll('a.bf').last().attr('file');
 	var efile = encodeURIComponent(file);
-	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	var bfile = file.replace(pathre, '');
 	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
 	var type = $(el).attr('type');
 	var id = $(el).attr('did');

From eab635cab628a69454c7c8e7a2907895b6fe8ff1 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 20 Mar 2021 00:54:20 +0000
Subject: [PATCH 72/91] Improve error trapping, actually make it work

---
 webif/lib/ts.class | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 6eb0b518..b38c97a4 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -862,6 +862,7 @@ ts method getkey {mode} {
 			if {[string length $key] == 32} {
 				ladd keys $key
 			}
+		} on error {} {
 		} finally {
 			catch {$fd close}
 		}
@@ -878,6 +879,7 @@ ts method getkey {mode} {
 			foreach key [split [$fd read -nonewline] "\n"] {
 				ladd keys $key
 			}
+		} on error {} {
 		} finally {
 			catch {$fd close}
 		}

From 541318fbbac27f84e4c4cfe54979cb35c633ee1b Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Sat, 20 Mar 2021 19:33:27 +0000
Subject: [PATCH 73/91] Update to 1.4.9-4

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index 852869c1..eab16f55 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-3
+Version: 1.4.9-4
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From d5b34ed2c3fa9a3258d959ca848afb5b1de3b8e8 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 20 Mar 2021 23:58:49 +0000
Subject: [PATCH 74/91] Fix unquoted string; add genre check; errors to stderr

---
 webif/html/browse/rename.jim |  8 +++++---
 webif/lib/ts.class           | 14 +++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/webif/html/browse/rename.jim b/webif/html/browse/rename.jim
index c141ae70..6f7f31dc 100755
--- a/webif/html/browse/rename.jim
+++ b/webif/html/browse/rename.jim
@@ -28,14 +28,16 @@ if {[file isdirectory $file]} {
 			set old [$ts get $attr]
 			if {$attr eq "title" || $attr eq "synopsis"} {
 				set new "\025$new"
+			} elseif {$attr eq "genre"} {
+				set new [ts genre $new]
 			}
 			if {$new ne $old} {
-				if {$attr eq guidance || $new ne ""} {
+				if {$attr eq "guidance" || $new ne ""} {
 					$ts set$attr $new
 				}
 			}
 		} msg]} {
-			puts "$attr: $msg"
+			stderr puts "$attr: $msg"
 		}
 	}
 	# deal with series number/ep num/ep total, which get set together
@@ -69,7 +71,7 @@ if {[file isdirectory $file]} {
 				lappend epdatanew $old
 			}
 		} msg]} {
-			puts "$attr: $msg"
+			stderr puts "$attr: $msg"
 		}
 	}
 	if {$epdatanew ne {}} {
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index b38c97a4..bcfe270c 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -322,10 +322,18 @@ ts method setguidance {newguidance} {
 	set guidance $newguidance
 }
 
-ts method setgenre {newgenre} {
-	if {$newgenre <= 15} {
-		set newgenre $($newgenre << 4)
+proc {ts genre} {genre} {
+	if {![string is integer $genre] || $genre < 0} {
+		set genre 0
 	}
+	if {$genre <= 15} {
+		set genre $($genre << 4)
+	}
+	return $genre
+}
+
+ts method setgenre {newgenre} {
+	set newgenre [ts genre $newgenre]
 	exec /mod/bin/hmt "+setgenre=-${newgenre}" $file
 	set genre $newgenre
 }

From 033eff6fcca410d25e4f6992dd707a090eb73f1f Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 10 Apr 2021 01:05:19 +0100
Subject: [PATCH 75/91] Ensure , is escaped in ::js::escape

---
 webif/lib/utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/lib/utils b/webif/lib/utils
index 7eb71e45..c7dbd84e 100644
--- a/webif/lib/utils
+++ b/webif/lib/utils
@@ -102,7 +102,7 @@ proc ::js::_unescape {str} {
 
 proc ::js::escape {str} {
 	return [subst -nobackslashes -novariables \
-		[regsub -all -- {[^A-Za-z0-9@*_+-./]+} $str \
+		[regsub -all -- {[^A-Za-z0-9@*_+./-]+} $str \
 			{[::js::_escape {&}]}]]
 }
 

From 2b51358c63c7cd22ffe8393d85ae326af0a60809 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Mon, 22 Mar 2021 21:57:35 +0000
Subject: [PATCH 76/91] Update to 1.4.9-5

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index eab16f55..0cda9bf7 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-4
+Version: 1.4.9-5
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From d04c094543262b1884bf543cc3c6fbb7d8d99bfa Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hpkg.tv>
Date: Sat, 10 Apr 2021 09:53:33 +0100
Subject: [PATCH 77/91] Update to 1.4.9-6

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index 0cda9bf7..b0baaacc 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-5
+Version: 1.4.9-6
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From cb549b499511347e93ad71eeab4b4973e91e3124 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 28 May 2021 14:14:34 +0100
Subject: [PATCH 78/91] Name ad-hoc attributes with data- prefix

---
 webif/html/browse/bookmarks/index.jim | 4 ++--
 webif/html/browse/bookmarks/script.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index b69350c4..89ecdf41 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -34,7 +34,7 @@ var dir = '$dir';
 <tr><th>Length:</th><td>[clock format $len -format %T]</td></tr>
 <tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
 <tr><th>Bookmarks<br><span class=footnote>(enter in seconds)</span></th><td>
-<input id=bookmarks size=80 maxlength=255 init=\"[$ts bookmarks]\"
+<input id=bookmarks size=80 maxlength=255 data-init=\"[$ts bookmarks]\"
     value=\"\" />
 <button id=update>Update</button>
 <br>
@@ -61,7 +61,7 @@ loop v $start $limit $incr {
 }
 puts "</tr><tr>"
 foreach v $times {
-	puts "<td><img class=bmp src=/img/generating.png pos=$v></td>"
+	puts "<td><img class=bmp src=/img/generating.png data-pos=$v></td>"
 }
 puts "
 </tr></table>
diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index 2226025c..ed522ff3 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -141,7 +141,7 @@ sortmarks()
 
 $(function() {
 
-$('#bookmarks').val($('#bookmarks').attr('init'));
+$('#bookmarks').val($('#bookmarks').attr('data-init'));
 draw_slider();
 $('#curbmk').html(toTimeStr(curval));
 
@@ -211,9 +211,9 @@ $('#genthumbs').button({icons: {primary: "ui-icon-zoomin"}, disabled: false})
 	    .button('option', 'icon', 'ui-icon-refresh');
 	$('img.bmp').each(function(i) {
 		if (start === undefined) {
-			start = $(this).attr('pos') | 0;
+			start = $(this).attr('data-pos') | 0;
 		} else {
-			last = $(this).attr('pos') | 0;
+			last = $(this).attr('data-pos') | 0;
 		}
 		incr++;
 	});
@@ -229,7 +229,7 @@ $('#genthumbs').button({icons: {primary: "ui-icon-zoomin"}, disabled: false})
 		$('#thumbs').show();
 		$('img.bmp').each(function(i) {
 			/* cast to "int" */
-			var pos = $(this).attr('pos')|0;
+			var pos = $(this).attr('data-pos')|0;
 			$(this).attr('src',
 			    '/browse/thumbnail/fetch.jim?' +
 			    'file=' + encodeURIComponent(file) +

From caafde56c848a1e2dd6911efc45d9cc6c0077d97 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 28 May 2021 15:05:42 +0100
Subject: [PATCH 79/91] Correctly end the HTML page with closing tags etc

---
 webif/html/browse/bookmarks/index.jim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index 89ecdf41..f1db845f 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -77,4 +77,8 @@ if {[system pkginst nicesplice]} {
 puts "
 </div>
 <div id=results class=\"hidden blood\"></div>
+</fieldset>
 "
+
+footer
+

From de1b690f36f6c4606ecaa9e2258f21e1821667f9 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Sat, 29 May 2021 15:08:12 +0100
Subject: [PATCH 80/91] Rework scripting for bookmark page; move presentation
 to CSS

---
 webif/html/browse/bookmarks/index.jim |  14 +-
 webif/html/browse/bookmarks/script.js | 426 ++++++++++++--------------
 webif/html/browse/bookmarks/style.css |  17 +
 3 files changed, 227 insertions(+), 230 deletions(-)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index f1db845f..c452722a 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -21,7 +21,6 @@ set limit $(1-$start)
 
 puts "
 <script type=text/javascript>
-var initbookmarks = '[$ts bookmarks]';
 var len = [$ts duration 1];
 var file = '$erfile';
 var dir = '$dir';
@@ -29,21 +28,20 @@ var dir = '$dir';
 <fieldset class=cleft>
 <legend>Manage Bookmarks</legend>
 
-<table class=keyval cellpadding=5>
+<table class=keyval>
 <tr><th>File:</th><td>$rfile</td></tr>
 <tr><th>Length:</th><td>[clock format $len -format %T]</td></tr>
 <tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
 <tr><th>Bookmarks<br><span class=footnote>(enter in seconds)</span></th><td>
-<input id=bookmarks size=80 maxlength=255 data-init=\"[$ts bookmarks]\"
-    value=\"\" />
+<input id=bookmarks size=80 maxlength=255 value=\"[$ts bookmarks]\" />
 <button id=update>Update</button>
 <br>
 <span id=bookmarkstime></span>
-</td></tr><tr><td align=right>
+</td></tr><tr><td class=cell-align-right>
 <button class=left id=addbmark>Add Bookmark</button>
 <button class=left id=delbmark>Remove Bookmark</button>
 </td><td><div id=slider></div></td></tr>
-<tr><td align=right>
+<tr><td class=cell-align-right>
 <span class=left>Current: <span id=curbmk></span></span><br><br><br>
 <button id=genthumbs title=\"Generate Thumbnails\"
     class=left>Generate Thumbnails</button>
@@ -55,13 +53,13 @@ set times {}
 loop v $start $limit $incr {
 	lappend times $v
 	puts "
-		<th style=\"text-align: center\"><span class=mark>
+		<th class=mark><span class=mark>
 		[format "%+d" $v]</span>s</th>
 	"
 }
 puts "</tr><tr>"
 foreach v $times {
-	puts "<td><img class=bmp src=/img/generating.png data-pos=$v></td>"
+	puts "<td><img class=bmp data-pos=$v alt=\"thumbnail @ $v s\"></td>"
 }
 puts "
 </tr></table>
diff --git a/webif/html/browse/bookmarks/script.js b/webif/html/browse/bookmarks/script.js
index ed522ff3..a3e1f5c6 100644
--- a/webif/html/browse/bookmarks/script.js
+++ b/webif/html/browse/bookmarks/script.js
@@ -1,243 +1,225 @@
-var curval = 0;
-var $slider;
-var values;
-
+/* using var len defined in inline script, index.jim */
+/* using var file defined in inline script, index.jim */
+/* using var dir defined in inline script, index.jim */
 function
 toTimeStr(tval)
 {
 	return new Date(null, null, null, null, null, tval)
-	    .toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0] + ' ';
+	    .toTimeString().match(/\d{2}:\d{2}:\d{2}/)[0];
 }
 
 function
 valarray(valstr)
 {
-	return valstr.trim().split(/ +/);
-}
-
-function
-setvals()
-{
-	var nvalues;
-	values = valarray($('#bookmarks').val());
-	if (values.length > 0 && values[0] != '')
-	{
-		refreshtimes();
-		return;
-	}
-	nvalues = [];
-	$.each(values, function(k, v) {
-		if (v > len)
-			v = len;
-		if (v < 0)
-			v = 0;
-		nvalues.push(v);
-	});
-	values = nvalues;
-	$('#bookmarks').val(values.join(' '));
-	values = valarray($('#bookmarks').val());
-	sortmarks();
-	refreshtimes();
-}
-
-function
-draw_slider()
-{
-	if ($slider)
-		$slider.slider('destroy');
-	else
-		$slider = $('#slider');
-	setvals();
-	if (!values.length || values[0] == '')
-	{
-		$slider = null;
-		return;
-	}
-	$slider.slider({
-		min: 0,
-		max: len,
-		step: 1,
-		values: values,
-		start: function(event, ui) {
-			curval = ui.value;
-		},
-		stop: function(event, ui) {
-			curval = ui.value;
-			sortmarks();
-			refreshtimes();
-		},
-		slide: function(event, ui) {
-			var marks = '';
-			for (var i = 0; i < ui.values.length; ++i)
-				marks += ui.values[i] + ' ';
-			$('#bookmarks').val(marks.trim());
-			setvals();
-		}
-	});
-	refreshtimes();
-};
-
-function
-regenthumbs(curbmkstr)
-{
-	$('#curbmk').html(curbmkstr);
-	$('#thumbs').hide();
-	$('#genthumbs')
-	    .button('enable')
-	    .button('option', 'icon', 'ui-icon-zoomin');
-}
-
-function
-update_slider()
-{
-	setvals();
-
-	/* slider values are strings */
-	var curvalstr = "" + curval;
-	if (!values.includes(curvalstr)) {
-		/* try to map current selected bmk to new bmk */
-		var ovalues = $slider.slider("option", "values");
-		var nn = ovalues.indexOf(curvalstr);
-		if (nn < 0) {
-			curval = 0;
-		} else {
-			if (nn >= values.length)
-			    nn = values.length - 1;
-			curval = nn >= 0 ? values[nn] : 0;
-		}
-		regenthumbs(toTimeStr(curval));
-	}
-	$('#slider .ui-slider-handle').each(function(i) {
-		if (i >= values.length)
-			$(this).hide();
-		else
-			$(this).show();
-	});
-	$slider.slider("option", "values", values);
-};
-
-function
-refreshtimes()
-{
-	var t = '';
-	if (!values.length || values[0] == '')
-	{
-		$.each(values, function(k, v) {
-			t += toTimeStr(v);
-		});
-		$('#slider .ui-slider-handle').each(function(i) {
-			$(this).attr('title', toTimeStr(values[i]));
-		});
-	}
-	$('#bookmarkstime').text(t);
-}
-
-function
-sortmarks()
-{
-	values.sort(function(a, b){return a - b});
-	$('#bookmarks').val(values.join(" "));
+	return valstr.trim().split(/\s+/);
 }
 
 $(function() {
+	var curval = 0;
+	var $slider;
+	var values;
 
-$('#bookmarks').val($('#bookmarks').attr('data-init'));
-draw_slider();
-$('#curbmk').html(toTimeStr(curval));
+	function
+	sortmarks()
+	{
+		values.sort(function(a, b){return a - b});
+		$('#bookmarks').val(values.join(" "));
+	}
 
-$('#addbmark').button({icons: {primary: "ui-icon-plus"}, text: false})
-    .on('click', function() {
-	$('#bookmarks').val('0 ' + $('#bookmarks').val());
-	curval = 0;
-	update_slider();
-});
-
-$('#delbmark').button({icons: {primary: "ui-icon-minus"}, text: false})
-    .on('click', function() {
-	var cur = $('#bookmarks').val();
-	cur = cur.replace(
-	    new RegExp('(^| )' + curval + '( |$)', ''), ' ').trim();
-	$('#bookmarks').val(cur);
-	update_slider();
-});
-
-$('#save').button({icons: {primary: "ui-icon-disk"}})
-    .on('click', function() {
-		$.post('save.jim', {
-			file: file,
-			bookmarks: $('#bookmarks').val()
-		}, function(data) {
-			$('#results').html(data)
-				.slideDown('slow').delay(5000).slideUp('slow');
-		});
-});
-
-$('#back').button({icons: {primary: "ui-icon-arrowreturnthick-1-w"}})
-    .on('click', function() {
-		window.location = '/go/browse?dir=' + encodeURIComponent(dir);
-});
-
-$('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
-    .on('click', function() {
-		window.location = 
-			window.location.href.replace('/bookmarks/?','/crop/crop.jim?');
-});
-
-$('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
-    .on('click', function() {
-	window.location =
-	    window.location.href.replace('/bookmarks/?','/crop/crop.jim?');
-});
-
-$('#update').button()
-    .on('click', function() {
-	update_slider();
-});
-
-$('#slider')
-    .on('slidechange', function(evt, ui) {
-	var tstr = toTimeStr(curval);
-	if (tstr != $('#curbmk').html())
-		regenthumbs(tstr);
-});
-
-$('#genthumbs').button({icons: {primary: "ui-icon-zoomin"}, disabled: false})
-    .on('click', function() {
-	var start;
-	var incr = -1;
-	var last;
-	$(this)
-	    .button('disable')
-	    .button('option', 'icon', 'ui-icon-refresh');
-	$('img.bmp').each(function(i) {
-		if (start === undefined) {
-			start = $(this).attr('data-pos') | 0;
-		} else {
-			last = $(this).attr('data-pos') | 0;
+	function
+	refreshtimes()
+	{
+		var t = '';
+		if (values.length > 0 && values[0] != '')
+		{
+			$.each(values, function(k, v) {
+				if (t != '') t += ', ';
+				t += toTimeStr(v);
+			});
+			$('#slider .ui-slider-handle').each(function(i) {
+				if (values[i]|0 > 0)
+				$(this).attr('title', toTimeStr(values[i]))
+				else $(this).attr('title', '');
+			});
+			$('#curbmk').html(toTimeStr(curval));
+			$('#genthumbs').button('enable');
 		}
-		incr++;
-	});
+		else
+		{
+			$('#genthumbs').button('disable');
+			$('#curbmk').html('');
+		}
+		$('#bookmarkstime').text(t);
+	}
 
-	incr = (last - start) / incr;
-
-	$.get('/browse/thumbnail/mkrange.jim', {
-		'file': file,
-		's':    start+curval,
-		'e':    last+curval,
-		'i':    incr
-	}, function() {
-		$('#thumbs').show();
-		$('img.bmp').each(function(i) {
-			/* cast to "int" */
-			var pos = $(this).attr('data-pos')|0;
-			$(this).attr('src',
-			    '/browse/thumbnail/fetch.jim?' +
-			    'file=' + encodeURIComponent(file) +
-			    '&pos=' + (curval+pos).toFixed(1));
+	function
+	setvals()
+	{
+		var nvalues;
+		values = valarray($('#bookmarks').val());
+		nvalues = new Set();
+		$.each(values, function(k, v) {
+			if (v > len)
+				v = len;
+			if (v < 0)
+				v = 0;
+			nvalues.add(v);
 		});
-		$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
+		values = Array.from(nvalues);
+		sortmarks();
+	}
+
+	function
+	regenthumbs(curbmkstr)
+	{
+		$('#curbmk').html(curbmkstr);
+		$('#thumbs').hide();
+		$('#genthumbs')
+		    .button(curbmkstr ? 'enable': 'disable')
+		    .button('option', 'icon', 'ui-icon-zoomin');
+	}
+
+	function
+	draw_slider()
+	{
+		if ($slider)
+			$slider.slider('destroy');
+		else
+			$slider = $('#slider');
+		setvals();
+		$slider.slider({
+			min: 0,
+			max: len,
+			step: 1,
+			disabled: values.length <= 0 || values[0] == '',
+			values: values,
+			start: function(event, ui) {
+				curval = ui.value;
+			},
+			stop: function(event, ui) {
+				curval = ui.value;
+				sortmarks();
+				refreshtimes();
+			},
+			slide: function(event, ui) {
+				var marks = '';
+				for (var i = 0; i < ui.values.length; ++i)
+					marks += ui.values[i] + ' ';
+				$('#bookmarks').val(marks.trim());
+				setvals();
+			}
+		});
+		refreshtimes();
+		
+		/* slider values are strings */
+		var curvalstr = "" + curval;
+		if (!values.includes(curvalstr)) {
+			/* try to map current selected bmk to new bmk */
+			var ovalues = $slider.slider("option", "values");
+			var nn = ovalues.indexOf(curvalstr);
+			if (nn < 0) {
+				curval = 0;
+				regenthumbs('');
+			} else {
+				if (nn >= values.length)
+				    nn = values.length - 1;
+				if (nn >= 0) {
+					regenthumbs(toTimeStr(curval = values[nn]));
+				} else {
+					curval = 0;
+					regenthumbs('');
+				}
+			}
+		}
+	};
+
+	$('#genthumbs').button({icons: {primary: "ui-icon-zoomin"}, disabled: true})
+	    .on('click', function() {
+		var start;
+		var incr = -1;
+		var last;
+		$(this)
+		    .button('disable')
+		    .button('option', 'icon', 'ui-icon-refresh');
+		$('img.bmp').each(function(i) {
+			if (start === undefined) {
+				start = $(this).attr('data-pos') | 0;
+			} else {
+				last = $(this).attr('data-pos') | 0;
+			}
+			incr++;
+			$(this).attr('src', '/img/generating.png');
+		});
+		$('#thumbs').show();
+
+		incr = (last - start) / incr;
+
+		$.get('/browse/thumbnail/mkrange.jim', {
+			'file': file,
+			's':    start+curval,
+			'e':    last+curval,
+			'i':    incr
+		}, function() {
+			$('img.bmp').each(function(i) {
+				/* cast to "int" */
+				var pos = $(this).attr('data-pos')|0;
+				$(this).attr('src',
+				    '/browse/thumbnail/fetch.jim?' +
+				    'file=' + encodeURIComponent(file) +
+				    '&pos=' + (curval+pos).toFixed(1));
+			});
+			$('#genthumbs').button('option', 'icon', 'ui-icon-zoomin');
+		});
+
 	});
 
-});
+	draw_slider();
 
+	$('#addbmark').button({icons: {primary: "ui-icon-plus"}, text: false})
+	    .on('click', function() {
+		$('#bookmarks').val('0 ' + $('#bookmarks').val());
+		curval = 0;
+		draw_slider();
+	});
+
+	$('#delbmark').button({icons: {primary: "ui-icon-minus"}, text: false})
+	    .on('click', function() {
+		var cur = $('#bookmarks').val();
+		cur = cur.replace(
+		    new RegExp('(^| )' + curval + '( |$)', ''), ' ').trim();
+		$('#bookmarks').val(cur);
+		draw_slider();
+	});
+
+	$('#save').button({icons: {primary: "ui-icon-disk"}})
+	    .on('click', function() {
+			$.post('save.jim', {
+				file: file,
+				bookmarks: $('#bookmarks').val()
+			}, function(data) {
+				$('#results').html(data)
+					.slideDown('slow').delay(5000).slideUp('slow');
+			});
+	});
+
+	$('#back').button({icons: {primary: "ui-icon-arrowreturnthick-1-w"}})
+	    .on('click', function() {
+			window.location = '/go/browse?dir=' + encodeURIComponent(dir);
+	});
+
+	$('#crop').button({icons: {primary: "ui-icon-arrowreturnthick-1-e"}})
+	    .on('click', function() {
+			window.location = 
+				window.location.href.replace('/bookmarks/?','/crop/crop.jim?');
+	});
+
+	$('#update').button()
+	    .on('click', draw_slider);
+
+	$('#slider')
+	    .on('slidechange', function(evt, ui) {
+		var tstr = toTimeStr(curval);
+		if (tstr != $('#curbmk').html())
+			regenthumbs(tstr);
+	});
 });
diff --git a/webif/html/browse/bookmarks/style.css b/webif/html/browse/bookmarks/style.css
index 493c75e6..fe09656a 100644
--- a/webif/html/browse/bookmarks/style.css
+++ b/webif/html/browse/bookmarks/style.css
@@ -14,3 +14,20 @@
 	margin-top: 5px;
 }
 
+/* <table class=keyval ... cellpadding=5> */
+.keyval th, .keyval td
+{
+	padding: 5px;
+}
+
+/* <td align=right> */
+.cell-align-right
+{
+	text-align: right;
+}
+
+/* <th style="text-align: center"> */
+th.mark
+{
+	text-align: center;
+}

From 4d9fa6b9612302c3dbaa54415e0dba3d104d0451 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Thu, 3 Jun 2021 00:38:46 +0100
Subject: [PATCH 81/91] Don't show Generate Thumbnails for ODEncrypted file

---
 webif/html/browse/bookmarks/index.jim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index c452722a..afc09199 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -43,8 +43,14 @@ var dir = '$dir';
 </td><td><div id=slider></div></td></tr>
 <tr><td class=cell-align-right>
 <span class=left>Current: <span id=curbmk></span></span><br><br><br>
+"
+if {![$ts flag "ODEncrypted"]} {
+	puts "
 <button id=genthumbs title=\"Generate Thumbnails\"
     class=left>Generate Thumbnails</button>
+"
+}
+puts "
 </td><td>
 <div id=thumbs class=hidden>
 <table><tr>

From a7a4067a7f151348c3210e9ca15cf10f90af5779 Mon Sep 17 00:00:00 2001
From: df <fieldhouse@gmx.net>
Date: Fri, 1 Oct 2021 15:45:13 +0100
Subject: [PATCH 82/91] Improve processing and display of custom encryption key

---
 .../html/settings/modules/advanced/init.hook  | 40 ++++++++-------
 .../settings/modules/advanced/settings.hook   | 23 ++++++++-
 webif/include/modversion.jim                  |  5 +-
 webif/lib/system.class                        | 49 ++++++++++++++++++-
 webif/lib/ts.class                            | 13 ++---
 5 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/webif/html/settings/modules/advanced/init.hook b/webif/html/settings/modules/advanced/init.hook
index abecda1c..03abd9e3 100644
--- a/webif/html/settings/modules/advanced/init.hook
+++ b/webif/html/settings/modules/advanced/init.hook
@@ -13,16 +13,30 @@ if {[cgi_get act] eq "xtelnet"} {
 
 if {[cgi_get act] eq "cryptokey"} {
 	set val [cgi_get cryptokey ""]
-	if {[string length "$val"] == 0} {
-		set val [system encryptionkey]
-		puts "Using native encryption key.<br>"
+	set nkey [system encryptionkey]
+	if {$val eq "" || [string equal -nocase $val $nkey]} {
+		if {[system customencryptionkey] ne ""} {
+			system customencryptionkey $nkey
+			system nugget cryptokey -init
+			puts "Using native encryption key."
+		} else {
+			puts "Native key unchanged."
+		}
+		set cryptokey ""
 	} elseif {[string length $val] != 32} {
-		puts "Encryption key is too short."
-		exit
+		puts "Encryption key must be 32 hexadecimal digits."
+	} else {
+		if {[string equal -nocase $val [system customencryptionkey]]} {
+			puts "Custom key unchanged."
+		} elseif {[set customkey [system customencryptionkey $val]] ne ""} {
+		        set cryptokey $customkey
+			system nugget cryptokey -init
+			puts "Installed new encryption key."
+		} else {
+			puts "Failed to install encryption key $val"
 	}
-	file write "/mod/boot/cryptokey" [binary format H* $val]
-	system nugget cryptokey -init
-	puts "Installed new encryption key."
+	}
+	puts "<br>"
 	exit
 }
 
@@ -33,15 +47,7 @@ set logsize [$settings logsize]
 set logkeep [$settings logkeep]
 set logage [$settings logage]
 
-set cryptokey [system encryptionkey]
-if {![catch {set ck_fd [open "/mod/boot/cryptokey"]}]} {
-	set ck_bytes [$ck_fd read 16]
-	$ck_fd close
-	binary scan $ck_bytes H* ck_key
-	if {[string length $ck_key] == 32} {
-		set cryptokey $ck_key
-	}
-}
+set cryptokey [system customencryptionkey]
 
 handle_int_update pkgdev $pkgdev "Development Package Display"
 handle_int_update rtschedule $rtschedule "Real-time scheduling"
diff --git a/webif/html/settings/modules/advanced/settings.hook b/webif/html/settings/modules/advanced/settings.hook
index 02d0ebea..2bc9ec65 100755
--- a/webif/html/settings/modules/advanced/settings.hook
+++ b/webif/html/settings/modules/advanced/settings.hook
@@ -60,7 +60,7 @@ puts "
 	<table>
 	<tr><th class=key>
 		Native encryption key
-	</th><td>[system encryptionkey]</td></tr>
+	</th><td><span id=nativekey>[system encryptionkey]</span></td></tr>
 	<tr>
 	<form class=auto id=cryptokey method=post action=$env(SCRIPT_NAME)>
 		<input type=hidden name=act value=cryptokey>
@@ -71,7 +71,26 @@ puts "
 			<small><input value=set type=submit></small>
 			<div id=cryptokey_output></div>
 		</td>
-	</form>
+	</form>"
+# Script that clears the custom key input field when the native key 
+# is restored by entering its full value (as shown in #nativekey).
+# We rely on magical knowledge that the form holding this <input> is
+# submitted with an Ajax call, and so we hook all successful Ajax calls,
+# but filter by the text returned (init.hook) to avoid unnecessary updates. 
+puts {
+	<script>
+	$(document).ajaxSuccess(
+		function(ev, jqXHR) {
+		        var ip;
+		        if ((jqXHR.responseText.indexOf("ative ") >= 0) &&
+			    ($("#nativekey").html() == (ip = $("input[name=cryptokey]")).prop("value"))) {
+				 ip.prop("value", "");
+			}
+		}
+	);
+	</script>
+}
+puts "
 	</tr><tr>
 		<td></td>
 		<td class=blood>
diff --git a/webif/include/modversion.jim b/webif/include/modversion.jim
index 85c7493d..43b5a361 100755
--- a/webif/include/modversion.jim
+++ b/webif/include/modversion.jim
@@ -20,7 +20,10 @@ puts "<br>Loader Version: [system loaderver]"
 puts "<br>System ID: [system systemid]"
 puts "<br>Serial Number: [system serialno]"
 if {$mws::pagetag eq "Diagnostics"} {
-	puts "<br>Encryption Key: [system encryptionkey]"
+	puts "<br>Native Encryption Key: [system encryptionkey]"
+        if {[set customkey [system customencryptionkey]] ne ""} {
+            puts "<br>Custom Encryption Key: $customkey"
+        }
 }
 puts "<br>Last Boot Reason: [system lastbootreason]"
 
diff --git a/webif/lib/system.class b/webif/lib/system.class
index e0ffb9aa..581d70e9 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -143,6 +143,13 @@ proc {system serialno} {} {{serial ""}} {
 	    string range $bytes 9 end]"
 	return $serial
 }
+proc {system keybytestostring} {key_bytes} {
+	binary scan $key_bytes H* key_str                         
+	if {[string length $key_str] == 32} {                    
+		return $key_str
+	}
+	return {}
+}                                                     
 
 proc {system encryptionkey} {} {{key ""}} {
 	if {$key ne ""} { return $key }
@@ -152,8 +159,46 @@ proc {system encryptionkey} {} {{key ""}} {
 	$fd seek 0xcb800
 	append bytes [$fd read 10]
 	$fd close
-	binary scan $bytes H* key
-	return $key
+	return [system keybytestostring $bytes]
+}
+
+proc {system customencryptionkey} {{key ""}} {{keyfile "/mod/boot/cryptokey"}} {
+
+        set ck_fd {}
+        try {
+            if {$key eq ""} {
+                set ck_fd [open $keyfile r]
+                set ck_bytes [$ck_fd read 16]
+                return [system keybytestostring $ck_bytes]
+            } elseif {[string equal -nocase $key [system encryptionkey]]} {
+                file delete -force $keyfile
+                return $key
+            } else {
+                set ck_bytes [binary format H* $key]
+                set test [system keybytestostring $ck_bytes]
+                if {![string equal -nocase $test $key]} {
+                    throw 1 "Invalid custom key"
+                }
+                if {[file exists $keyfile]} {
+                    # attempt not to truncate on update until written
+                    set access r+
+                } else {
+                    set access w
+                }
+                set ck_fd [open $keyfile $access]
+                $ck_fd seek 0
+                $ck_fd puts -nonewline $ck_bytes
+                $ck_fd close
+                set ck_fd {}
+                return $key
+            }
+        } on error {msg opts} {
+           return {}
+        } finally {
+            if {$ck_fd ne {}} {
+                $ck_fd close
+            }
+        }
 }
 
 proc {system loaderver} {} {{ver ""}} {
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index bcfe270c..526814a5 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -863,16 +863,9 @@ ts method getkey {mode} {
 	}
 	if { $mode ne "dlna" } {
 		# also try other keys, such as this - same as active?
-		try {
-			set fd [open "/mod/boot/cryptokey"]
-			set bytes [$fd read 16]
-			binary scan $bytes H* key
-			if {[string length $key] == 32} {
-				ladd keys $key
-			}
-		} on error {} {
-		} finally {
-			catch {$fd close}
+		set key [system customencryptionkey]
+		if {$key ne ""} {
+			ladd keys $key
 		}
 
 		# the native key

From e5a8f12a15adecfd06f7f7e44332b76e69b9bbed Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:02:14 +0000
Subject: [PATCH 83/91] Join files with names containing ampersand

---
 webif/html/browse/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 11bb2cde..d7bd0f62 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -1046,7 +1046,7 @@ $('#join').button({icons: {primary: "ui-icon-video"}})
     .click(function() {
 	var files = new Array();
 	var els = $('input.fsts:checked + a').each(function() {
-		files.push($(this).attr('file'));
+		files.push(encodeURIComponent($(this).attr('file')));
 	});
 	//console.log("%o", files);
 	window.location.href = '/browse/join/join.jim?files=' +

From 51719420ba9e4db59f37d235595ecb7723af8e8f Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:04:06 +0000
Subject: [PATCH 84/91] Add Power cycle reason

---
 webif/lib/lib.sh       | 1 +
 webif/lib/system.class | 1 +
 2 files changed, 2 insertions(+)

diff --git a/webif/lib/lib.sh b/webif/lib/lib.sh
index 90431f57..8493d25e 100644
--- a/webif/lib/lib.sh
+++ b/webif/lib/lib.sh
@@ -7,6 +7,7 @@ lbr_descr()
 			1) echo "Front panel button" ;;
 			2) echo "Remote control handset" ;;
 			3) echo "Scheduled event" ;;
+			4) echo "Power cycle" ;;
 			*) echo "Unknown `cat /tmp/.lbr`" ;;
 		esac
 	else
diff --git a/webif/lib/system.class b/webif/lib/system.class
index c63cfa1c..9da71279 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -72,6 +72,7 @@ proc {system lastbootreason} {{descr 1}} {{lbr -1}} {
 		1 { return "Front panel button" }
 		2 { return "Remote control handset" }
 		3 { return "Scheduled event" }
+		4 { return "Power cycle" }
 	}
 	return "Unknown ($lbr)"
 }

From 99f22c6a28f13074d60e8fa40beca29af4475cf2 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:06:02 +0000
Subject: [PATCH 85/91] Use 24h clock when adding manual scheduled event

---
 webif/html/sched/list/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/sched/list/script.js b/webif/html/sched/list/script.js
index ebbf548b..ca6c7cf0 100755
--- a/webif/html/sched/list/script.js
+++ b/webif/html/sched/list/script.js
@@ -362,7 +362,7 @@ $('button.manual_rsv').button({icons:{primary:"ui-icon-clock"}})
 
 $('#mrform input.time').timepicker({
 	showDuration: true,
-	timeFormat: 'g:ia',
+	timeFormat: 'H:i',
 	step:5
 });
 

From 778c328a79fceddbad67dad5479372d71ceb7422 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:07:58 +0000
Subject: [PATCH 86/91] Improve disk check functionality and layout

---
 webif/include/diskcheck.jim | 152 +++++++++++++++++++++++-------------
 webif/include/notify.jim    |   2 +-
 2 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/webif/include/diskcheck.jim b/webif/include/diskcheck.jim
index 9299ecff..e79660af 100755
--- a/webif/include/diskcheck.jim
+++ b/webif/include/diskcheck.jim
@@ -2,77 +2,119 @@
 
 source /mod/webif/lib/setup
 require system.class
-
-if {[system model] eq "HDR"} {
-
 require settings.class
 
-set smartattrs {realloc pending offline spinretry}
-
-set smartattribs(SMART_status) "Unknown"
-foreach sa $smartattrs {
-	set smartattribs(SMART_$sa) 0
-	set smartattribs(SMART_ack_$sa) 0
-}
-
-foreach line [[settings] smartdata] {
-	lassign $line x name x n x t
-	if {$name eq "SMART_status"} {
-		set smartattribs($name) $t
-	} else {
-		set smartattribs($name) $n
+proc {system disksmart} {} {
+	set smartmsg ""
+	
+	set smartattrs {realloc pending offline spinretry}
+	
+	set smartattribs(SMART_status) "Unknown"
+	foreach sa $smartattrs {
+		set smartattribs(SMART_$sa) 0
+		set smartattribs(SMART_ack_$sa) 0
 	}
-}
-
-# (SMART_ack_status 0 SMART_ack_pending 0 SMART_status PASSED SMART_pending 7 SMART_ack_realloc 0 SMART_ack_offline 0 SMART_realloc 0 SMART_offline 7)
-
-set smartmsg ""
-if {$smartattribs(SMART_status) ne "PASSED"} {
-	append smartmsg \
-	    "Disk overall health assessment is: $smartattribs(SMART_status)\n"
-}
-
-foreach sa $smartattrs {
-	if {$smartattribs(SMART_$sa) != $smartattribs(SMART_ack_$sa)} {
-		append smartmsg \
-		    "Disk $sa sector count is: $smartattribs(SMART_$sa)"
-		if {$smartattribs(SMART_ack_$sa) > 0} {
-			append smartmsg " (was $smartattribs(SMART_ack_$sa))"
+	
+	foreach line [[settings] smartdata] {
+		lassign $line x name x n x t
+		if {$name eq "SMART_status"} {
+			set smartattribs($name) $t
+		} else {
+			set smartattribs($name) $n
 		}
-		append smartmsg "\n"
 	}
+	
+	# (SMART_ack_status 0 SMART_ack_pending 0 SMART_status PASSED SMART_pending 7 SMART_ack_realloc 0 SMART_ack_offline 0 SMART_realloc 0 SMART_offline 7)
+	
+	if {$smartattribs(SMART_status) ne "PASSED"} {
+		append smartmsg \
+		    "Disk overall health assessment is: $smartattribs(SMART_status)\n"
+	}
+	
+	foreach sa $smartattrs {
+		if {$smartattribs(SMART_$sa) != $smartattribs(SMART_ack_$sa)} {
+			append smartmsg \
+			    "Disk $sa sector count is: $smartattribs(SMART_$sa)"
+			if {$smartattribs(SMART_ack_$sa) > 0} {
+				append smartmsg " (was $smartattribs(SMART_ack_$sa))"
+			}
+			append smartmsg "\n"
+		}
+	}
+	return $smartmsg
 }
 
-if {$smartmsg ne ""} {
+proc {system diskro} {} {
+        if {[system model] eq "HDR"} {
+		set dev {/mnt/hd[1-3]}
+	} else {
+		set dev [system diskpart]
+	}                                                                       
+
+	# Python re: no POSIX character classes
+	# Jim TCL regex: no \x character classes
+	# Why not have both ...
+	set s {[[:blank:]]}
+	set a {[[:alnum:]]}
+	set nc {[^,]}
+        set roparts [lsearch -all -inline -regexp \
+                [split [file read /proc/mounts] "\n\r"] \
+		"${s}${dev}${s}+${a}+${s}*(${s}|${nc}+,)ro(,|$|${s})"]
+        return [join [lmap line $roparts \
+        	{format "Filesystem %s on %s is read-only" [lindex $line 1] [lindex $line 0]}] "\n"]
+}
+
+set smartmsg [system disksmart]
+set romsg [system diskro]
+
+if {$smartmsg ne "" || $romsg ne ""} {
 	if {![dict exists $env SCRIPT_NAME]} { set env(SCRIPT_NAME) "" }
-	puts "
-<div id=smartwarning class=warningbox><center>
+	puts {
+<div id=smartwarning class=warningbox style="width: 80%; left: 1%"><center>
 !! WARNING !!
-<br><br>
-There are potential hardware problems with the internal hard disk on
-this device.
-<br><br>
+<br><br>}
+	set problems " "
+	if {$smartmsg ne ""} {
+		append problems "potential hardware"
+	}
+	if {$romsg ne ""} {
+		if {[string index $problems end] ne " "} {
+			append problems " and/or "
+		} 
+		append problems "filesystem"
+	}
+	if {[string index $problems end] ne " "} {
+		append problems " "
+	}
+	puts [format "
+There are %sproblems with the hard disk on
+this system.
+<br><br>" $problems]
+	if {$smartmsg ne ""} {
+		puts "
 [string map {"\n" "<br>"} $smartmsg]
-	"
+<br>
+"
+	}
+	if {$romsg ne ""} {
+		puts "
+[string map {"\n" "<br>"} $romsg]
+<br><br>
+"
+	}
 	if {$env(SCRIPT_NAME) ne "/diag/disk.jim"} {
 		puts "
-			<br>
-			<a href=/diag/disk.jim>Go to disk diagnostics</a>
-		"
+Go to <a href=/diag/disk.jim>Disk Diagnostics</a>
+"
 	} else {
 		puts "
-			<br>
-			Don't panic; for help, visit
-			<a target=_blank
-			    href=http://wiki.hummy.tv/wiki/Disk_Problem>
-				wiki.hummy.tv
-			</a>
-		"
+<br>
+Don't panic; for help, visit
+<a target=_blank href=\"http://wiki.hummy.tv/wiki/Disk_Problem\">wiki.hummy.tv</a>
+"
 	}
 	puts "
 </center></div>
-	"
-}
-
+"
 }
 
diff --git a/webif/include/notify.jim b/webif/include/notify.jim
index 300f7c17..137ce36c 100755
--- a/webif/include/notify.jim
+++ b/webif/include/notify.jim
@@ -5,7 +5,7 @@ if {[file exists /mod/tmp/notify.log]} {
 source /mod/webif/lib/setup
 
 puts {
-<div id=sysnotify class=warningbox style="width: 90%"><center>
+<div id=sysnotify class=warningbox style="width: 90%;left: 1%"><center>
 !! WARNING !!
 <br><br>
 You have pending system notifications:

From c5c4091cf67d6409db8bd42848bf5115e48174e6 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:17:12 +0000
Subject: [PATCH 87/91] Update to 1.4.9-7

---
 CONTROL/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTROL/control b/CONTROL/control
index b0baaacc..ac793af0 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-6
+Version: 1.4.9-7
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.13),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),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

From 0d7ba4744f089b80bf7314ae677e5cd7a82434ec Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:34:40 +0000
Subject: [PATCH 88/91] Revert e79e85af81

---
 webif/html/browse/index.jim |   4 +-
 webif/lib/system.class      |   4 -
 webif/lib/system.class.orig | 921 ++++++++++++++++++++++++++++++++++++
 webif/lib/ts.class          |   2 +-
 webif/lib/ts.class.orig     | 899 +++++++++++++++++++++++++++++++++++
 5 files changed, 1823 insertions(+), 7 deletions(-)
 create mode 100644 webif/lib/system.class.orig
 create mode 100644 webif/lib/ts.class.orig

diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 587f67eb..8e6f27c7 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -215,8 +215,8 @@ proc entry {file} {{i 0}} {
 
 	# Indexed
 	set dlna 0
-	if {$::dlnaok && $::model eq "HDR" && 
-		[llength [system dlnaurl $file]]} {
+	if {$::dlnaok && $::model eq "HDR" && [llength [
+	    system dlnaurl [file normalize $file]]]} {
 		icon "/img/dlna.png" "Indexed by DLNA Server"
 		set dlna 1
 	}
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 9da71279..cb19d188 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -316,10 +316,6 @@ proc {system dlnadb} {} {
 
 proc {system _dlnaurl} {file urlbase} {
 	set mime "video/mp2t"
-	set nfile $file
-	if {![catch {set nfile [file normalize $file]}]} {
-		set file $nfile
-	}
 	if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
 		return {}
 	}
diff --git a/webif/lib/system.class.orig b/webif/lib/system.class.orig
new file mode 100644
index 00000000..9da71279
--- /dev/null
+++ b/webif/lib/system.class.orig
@@ -0,0 +1,921 @@
+
+source /mod/webif/lib/setup
+
+package require xconv
+
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
+if {![exists -command binary]} { package require binary }
+
+class system {}
+
+proc {system model} {} {{model ""}} {
+	if {$model ne ""} { return $model }
+	if {[catch {set fp [open /etc/model r]}]} {
+		set model {HD[R]}
+	} else {
+		set model [string trim [read $fp]]
+		close $fp
+	}
+	return $model
+}
+
+proc {system hostname} {} {
+	if {[catch {set hostname [string trim [exec hostname]]}]} {
+		set hostname "humax"
+	}
+	return $hostname
+}
+
+proc {system ip} {} {
+	if {[catch {set fp [open /etc/hosts r]}]} {
+		set ip "127.0.0.1"
+	} else {
+		set ipl [lindex [split [$fp read] "\n"] 1]
+		regsub -- {[[:space:]].*} $ipl "" ip
+		$fp close
+	}
+	return $ip
+}
+
+proc {system modversion} {{short 0}} {{modver ""}} {
+	if {$modver eq ""} {
+		if {[catch {set fp [open /etc/modversion r]}]} {
+			set modver "102"
+		} else {
+			set modver [string trim [read $fp]]
+			close $fp
+		}
+	}
+	if {$short} { return $modver }
+	lassign [split $modver ""] a b c
+	return [format "%d.%d%d" $a $b $c]
+}
+
+proc {system modbuild} {} {{modbuild ""}} {
+	if {$modbuild ne ""} { return $modbuild }
+	if {[catch {set modbuild [string trim [file read /etc/modbuild]]}]} {
+		set modbuild 0
+	}
+	return $modbuild
+}
+
+proc {system lastbootreason} {{descr 1}} {{lbr -1}} {
+	if {$lbr == -1} {
+		set lbr 0
+		if {[file readable /tmp/.lbr]} {
+			set lbr [file read /tmp/.lbr]
+		}
+	}
+	if {!$descr} { return $lbr }
+	switch $lbr {
+		1 { return "Front panel button" }
+		2 { return "Remote control handset" }
+		3 { return "Scheduled event" }
+		4 { return "Power cycle" }
+	}
+	return "Unknown ($lbr)"
+}
+
+proc {system idletime} {} {
+	if {[file exists "/tmp/.lastir"]} {
+		return $([clock seconds] - [file mtime "/tmp/.lastir"])
+	}
+	return 0
+}
+
+proc {system fhtcpversion} {} {{ver ""}} {
+	if {$ver ne ""} { return $ver }
+	set file "/etc/fhtcpversion"
+	if {![file exists $file]} { set file "/root/fhtcpversion" }
+	if {[catch {set fp [open $file r]}]} {
+		set ver "?.??.??"
+	} else {
+		set ver [string trim [read $fp]]
+		close $fp
+	}
+	return $ver
+}
+
+#  :c0400	System ID
+# 4:c8400	read 1128 bytes
+# 3:c8c00	MAC address
+# 2:c9000
+# 1:cb400	DTCP key material
+# 0:cb800	Serial Number
+# 5:cbc00
+
+proc {system systemid} {} {{id ""}} {
+	if {$id ne ""} { return $id }
+	set fd [open /dev/mtd3 r]
+	
+	$fd seek 0xc0400
+	set bytes [$fd read 4]
+	$fd close
+	binary scan $bytes H* hex
+	set id [format "%s.%s" [string range $hex 0 3] [string range $hex 4 end]]
+	return $id
+}
+
+proc {system macaddr} {} {{mac ""}} {
+	if {$mac ne ""} { return $mac }
+	set fd [open /dev/mtd3 r]
+	
+	$fd seek 0xc8c00
+	set bytes [$fd read 6]
+	$fd close
+	set tmac ""
+	foreach b [split $bytes ""] {
+		binary scan $b H* hex
+		if {$tmac ne ""} { append tmac : }
+		append tmac $hex
+	}
+	return [set mac $tmac]
+}
+
+proc {system serialno} {} {{serial ""}} {
+	if {$serial ne ""} { return $serial }
+	set fd [open /dev/mtd3 r]
+	
+	$fd seek 0xcb800
+	set bytes [$fd read 14]
+	$fd close
+	set serial "[string range $bytes 0 1] [string range $bytes 2 8] [
+	    string range $bytes 9 end]"
+	return $serial
+}
+proc {system keybytestostring} {key_bytes} {
+	binary scan $key_bytes H* key_str                         
+	if {[string length $key_str] == 32} {                    
+		return $key_str
+	}
+	return {}
+}                                                     
+
+proc {system encryptionkey} {} {{key ""}} {
+	if {$key ne ""} { return $key }
+	set fd [open /dev/mtd3 r]
+	$fd seek 0xc8c00
+	set bytes [$fd read 6]
+	$fd seek 0xcb800
+	append bytes [$fd read 10]
+	$fd close
+	return [system keybytestostring $bytes]
+}
+
+proc {system customencryptionkey} {{key ""}} {{keyfile "/mod/boot/cryptokey"}} {
+
+        set ck_fd {}
+        try {
+            if {$key eq ""} {
+                set ck_fd [open $keyfile r]
+                set ck_bytes [$ck_fd read 16]
+                return [system keybytestostring $ck_bytes]
+            } elseif {[string equal -nocase $key [system encryptionkey]]} {
+                file delete -force $keyfile
+                return $key
+            } else {
+                set ck_bytes [binary format H* $key]
+                set test [system keybytestostring $ck_bytes]
+                if {![string equal -nocase $test $key]} {
+                    throw 1 "Invalid custom key"
+                }
+                if {[file exists $keyfile]} {
+                    # attempt not to truncate on update until written
+                    set access r+
+                } else {
+                    set access w
+                }
+                set ck_fd [open $keyfile $access]
+                $ck_fd seek 0
+                $ck_fd puts -nonewline $ck_bytes
+                $ck_fd close
+                set ck_fd {}
+                return $key
+            }
+        } on error {msg opts} {
+           return {}
+        } finally {
+            if {$ck_fd ne {}} {
+                $ck_fd close
+            }
+        }
+}
+
+proc {system loaderver} {} {{ver ""}} {
+	if {$ver ne ""} { return $ver }
+	set fd [open /dev/mtd3 r]
+	$fd seek 0x20006
+	set bytes [$fd read 2]
+	$fd close
+	set ver [switch $bytes {
+		"\x04\x5f" { format "a7.30" }
+		"\xec\xe5" { format "a7.31" }
+		"\x59\x9d" { format "a7.33" }
+		"\x72\x5c" { format "a7.34" }
+		"\xe5\xe3" { format "L7.26" }
+		"\x8f\x7c" { format "L7.27" }
+		default {
+			binary scan $bytes H* hex
+			format "Unknown - $hex"
+		}
+	}]
+	return $ver
+}
+
+proc {system kernelver} {} {{ver ""}} {
+	if {$ver ne ""} { return $ver }
+	#1 SMP Sun Mar 25 18:30:38 KST 2012
+	set rver [string range [exec uname -v] 11 end]
+	set ver [switch $rver {
+		# HDR
+		"Sep 16 20:17:56 KST 2010" { format "HDR_1.01.05" }
+		"Oct 11 21:11:05 KST 2010" { format "HDR_1.01.09" }
+		"Jan 21 15:44:39 KST 2011" { format "HDR_1.02.07" }
+		"Jun 11 00:54:19 KST 2011" { format "HDR_1.02.20" }
+		"Mar 25 18:30:38 KST 2012" { format "HDR_1.02.27" }
+		"May 27 00:19:34 KST 2012" { format "HDR_1.02.28" }
+		"Jul 5 11:11:28 KST 2012"  { format "HDR_1.02.29" }
+		"Jan 12 16:49:05 KST 2013" { format "HDR_1.02.32" }
+		"Mar 6 07:27:02 KST 2013"  { format "HDR_1.03.06(a)" }
+		"May 8 14:32:30 KST 2013"  { format "HDR_1.03.06(b)" }
+		"Dec 10 14:36:54 KST 2013" { format "HDR_1.03.11" }
+		"Feb 7 14:15:02 KST 2014"  { format "HDR_1.03.12" }
+		"May 19 22:39:27 BST 2014" { format "HDR_CFW_3.00" }
+		"Feb 19 20:58:57 GMT 2015" { format "HDR_CFW_3.03" }
+		"Mar 11 23:34:27 GMT 2016" { format "HDR_CFW_3.10" }
+		"Mar 11 23:37:22 GMT 2016" { format "HDR_CFW_3.10d" }
+		"Jan 9 04:46:49 GMT 2017"  { format "HDR_CFW_3.11" }
+		"Jan 9 04:50:13 GMT 2017"  { format "HDR_CFW_3.11d" }
+		"Mar 23 19:36:14 GMT 2017" { format "HDR_CFW_3.12" }
+		"Mar 23 19:39:44 GMT 2017" { format "HDR_CFW_3.12d" }
+		"Apr 18 22:42:30 BST 2017" { format "HDR_CFW_3.13" }
+		"Apr 18 22:45:34 BST 2017" { format "HDR_CFW_3.13d" }
+		"Mar 29 13:48:27 BST 2020" { format "HDR_CFW_3.14" }
+		"Mar 29 13:52:16 BST 2020" { format "HDR_CFW_3.14d" }
+
+		# HD
+		"Oct 11 21:14:31 KST 2010" { format "HD_1.01.12" }
+		"May 17 14:16:20 KST 2011" { format "HD_1.02.18" }
+		"Jun 11 00:54:19 KST 2011" { format "HD_1.02.20" }
+		"Mar 25 07:09:19 KST 2012" { format "HD_1.02.27" }
+		"May 27 00:19:40 KST 2012" { format "HD_1.02.28" }
+		"Jul 5 19:41:17 KST 2012"  { format "HD_1.02.29" }
+		"Oct 13 12:48:09 KST 2012" { format "HD_1.02.31" }
+		"Dec 9 14:15:07 KST 2014"  { format "HD_1.03.02" }
+
+		default { format "Unknown - $rver" }
+	}]
+	return $ver
+}
+
+# Newer version below is over 100 times faster
+#proc {system pkgver} {{pkg webif}} {
+#	return [lrange [split [exec opkg list-installed $pkg] " "] 2 end]
+#}
+
+proc {system pkgver} {{pkg webif}} {
+	if {[catch {set fp [open /mod/var/opkg/info/$pkg.control r]}]} {
+		return 0
+	}
+
+	set v 0
+	foreach line [split [$fp read] "\n"] {
+		if {[string equal -length 9 $line "Version: "]} {
+			lassign $line x v
+			break
+		}
+	}
+	$fp close
+	return $v
+}
+
+proc {system pkginst} {pkg} {
+	return [file exists "/mod/var/opkg/info/$pkg.control"]
+}
+
+proc {system mediaroot} {} {
+	switch [system model] {
+		HDR { return "/media/My Video" }
+		HD { return "/media/drive1/Video" }
+	}
+	return ""
+}
+
+proc {system dlnastatus} {} {
+	return [system is_listening 9000]
+}
+
+proc {system dlnadb} {} {
+	switch [system model] {
+		HDR { return "/mnt/hd2/dms_cds.db" }
+		HD { return "/media/drive1/dms_cds.db" }
+	}
+	return ""
+}
+
+proc {system _dlnaurl} {file urlbase} {
+	set mime "video/mp2t"
+	set nfile $file
+	if {![catch {set nfile [file normalize $file]}]} {
+		set file $nfile
+	}
+	if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
+		return {}
+	}
+	set muri [$db query {
+	    select tblresource.mimetype, contenturi
+	    from tblresource join tblmedia using (mediaid)
+	    where localurl = '%s'} $file]
+	if {[llength $muri]} {
+		lassign [lindex $muri 0] x maybemime x xuri
+		if {$maybemime ne "video/ts"} {
+			set mime $maybemime
+		}
+	} else {
+		# Try for partially linked entry
+		set muri [$db query {
+			select mediaid from tblmedia
+			where localurl = '%s'
+		    } $file]
+		if {![llength $muri]} { return {} }
+		lassign [lindex $muri 0] x mediaid
+		set xuri "media/$mediaid.TS"
+	}
+
+	$db close
+
+	set url "http://${urlbase}:9000/web/$xuri"
+
+	return [list $url $mime]
+}
+
+proc {system dlnaurl} {file {urlbase "127.0.0.1"}} {
+	if {$urlbase eq ""} { set urlbase [system ip] }
+	set retries 5
+	set ret {}
+	while {$retries > 0 && [\
+	    catch {set ret [system _dlnaurl $file $urlbase]}]} {
+		incr retries -1
+		sleep 1
+	}
+	return $ret
+}
+
+proc {system dlnahelper} {file {urlbase "127.0.0.1"}} {
+	set dir /mnt/hd2/mod/.dlnahelper
+	require lock
+
+	if {$file eq "-release"} {
+		release_lock dlnahelper
+		return {}
+	}
+
+	if {![acquire_lock dlnahelper 2]} { return {} }
+
+	if {![file isdirectory $dir]} { file mkdir $dir }
+
+	set base [file rootname $file]
+	foreach ext {hmt ts} {
+		file delete "$dir/helper.$ext"
+		file link -symbolic "$dir/helper.$ext" "$base.$ext"
+	}
+
+	set ret [system dlnaurl "$dir/helper.ts" $urlbase]
+	if {![llength $ret]} {
+		# Manually import the helper file.
+		if {![catch {set db [sqlite3.open [system dlnadb]]}]} {
+			$db query {
+				insert into tblmedia
+				(localurl,folder,mediatype,refcount)
+				values('%s','%s',0,1)
+			} "$dir/helper.ts" $dir
+			$db close
+			set ret [system dlnaurl "$dir/helper.ts" $urlbase]
+		}
+	}
+	if {![llength $ret]} {
+		release_lock dlnahelper
+	}
+	return $ret
+}
+
+proc {system dustbin} {{short 0}} {
+	set dustbin "\[Deleted Items\]"
+	if {![catch {set fd [open "/mod/boot/dustbin.name" r]}]} {
+		set dustbin [lindex [split [read $fd] "\n"] 0]
+		$fd close
+	}
+	if {$short} { return $dustbin }
+	return "[system mediaroot]/$dustbin"
+}
+
+proc {system dustbinsize} {} {
+	set bin [system dustbin]
+	set ret 0
+	if {[file isdirectory $bin]} {
+		if {[catch {
+			lassign [exec /mod/bin/busybox/du -s $bin] ret
+		}]} {
+			set ret 0
+		}
+	}
+	return $($ret * 1024)
+}
+
+proc {system diskpart} {} {
+	switch [system model] {
+		HDR { return "/mnt/hd2" }
+		HD { return "/media/drive1" }
+	}
+	return ""
+}
+
+proc {system diskdev} {} {
+	return [lindex [lsearch -regexp -inline \
+	    [split [file read /proc/mounts] "\n\r"] " [system diskpart] "] 0]
+}
+
+proc {system disk} {} {
+	return [string range [system diskdev] 0 end-1]
+}
+
+proc {system disktemp} {} {
+	if {[catch {
+		set smart [exec /bin/smartctl -A [system disk] | grep ^194]
+		regsub -all -- {[[:space:]]+} $smart " " smart
+		set temp [lindex [split $smart] 9]
+	}]} {
+		set temp 0
+	}
+	return $($temp + 0)
+}
+
+proc {system tsrdir} {} {
+	switch [system model] {
+		HDR {
+			set tsrdir "/mnt/hd2/Tsr"
+		}
+		HD {
+			set tsrdir "/media/drive1/.tsr"
+		}
+	}
+	return $tsrdir
+}
+
+proc {system tsr} {} {
+	return [file join [system tsrdir] "0.ts"]
+}
+
+require pretty_size
+
+proc {system diskspace} {{raw 0}} {
+	set part [system diskpart]
+
+	lassign [exec /mod/bin/busybox/stat -f -c {%S %b %f} $part] \
+	    bsize blocks fblocks
+
+	set size $($bsize * $blocks)
+	set free $($bsize * $fblocks)
+	set used $($size - $free)
+	set perc $($used * 100 / $size)
+	set fperc $(100 - $perc)
+
+	set tsrdir [system tsrdir]
+	switch [system model] {
+		HDR {
+			set tsrok [file isdirectory $tsrdir]
+		}
+		HD {
+			set tsrok [file exists "$tsrdir/0.ts"]
+		}
+	}
+
+	if {$tsrok} {
+		set tsrbuf 21474836480
+		if {[catch {
+			lassign [exec du -ks $tsrdir] tsrused
+		}]} {
+			set tsrused 0
+			set tsrbuf 0
+		} else {
+			set tsrused $($tsrused * 1024)
+		}
+	} else {
+		set tsrbuf 0
+		set tsrused 0
+	}
+
+	if {!$raw} {
+		set size [pretty_size $size]
+		set free [pretty_size $free]
+		set used [pretty_size $used]
+		set tsrbuf [pretty_size $tsrbuf]
+		set tsrused [pretty_size $tsrused]
+	}
+
+	return [list $size $used $perc $free $fperc $tsrbuf $tsrused]
+}
+
+proc {system diskfree} {} {
+	lassign [exec /mod/bin/busybox/stat -f -c {%S %f} [system diskpart]] \
+	    bsize fblocks
+	return $($bsize * $fblocks)
+}
+
+proc {system busy} {} {
+	# Is humaxtv doing anything important?
+	if {[catch {set pid [exec /mod/bin/busybox/pgrep -n humaxtv]}]} {
+		return 0
+	}
+	set c 0
+	foreach line [split [\
+	    exec /mod/webif/lib/bin/lsof -X -Fn -p $pid] "\n"] {
+		if {[string match {*Video*.ts} $line]} { incr c }
+	}
+	if {$c > 0} { return 1 }
+	return 0
+}
+
+proc {system inuse} {file} {
+	if {![file exists $file]} { return 0 }
+	set op [exec /mod/webif/lib/bin/lsof -X -Fn $file]
+	switch -glob -- $op {
+		"" -
+		"*status error*" { return 0 }
+	}
+	return 1
+}
+
+proc {system dirinuse} {dir} {
+	set files {}
+	foreach line [split [\
+	    exec /mod/webif/lib/bin/lsof -X -Fn +d $dir] "\n"] {
+		if {[string index $line 0] ne "n"} continue
+		lappend files [file tail $line]
+	}
+	return $files
+}
+
+proc {system reboot} {{fast 0}} {
+	if {$fast} {
+		exec /mod/webif/lib/bin/reboot -f
+	} else {
+		exec /mod/webif/lib/bin/reboot
+	}
+}
+
+proc {system restartpending} {{mode 1}} {
+	if {$mode} {
+		close [open /tmp/.restartpending w]
+	} else {
+		file delete /tmp/.restartpending
+	}
+}
+
+proc {system param} {param {type Value} {tbl MENUCONFIG}} {
+	if {[catch {set db [sqlite3.open /var/lib/humaxtv/setup.db]} msg]} {
+		return 0
+	}
+	set val 0
+	set ret [$db query "
+		select item$type
+		from TBL_$tbl
+		where itemName = '$param'
+	"]
+	if {[llength $ret] == 1} {
+		lassign [lindex $ret 0] x val
+	}
+	$db close
+	return $val
+}
+
+proc {system padding} {} {
+	return [list \
+		[system param START_PADDING_TIME] \
+		[system param STOP_PADDING_TIME] \
+	]
+}
+
+proc {system instandby} {} {
+	return [system param LAST_STANDBY Value USERCONFIG]
+}
+
+proc {system mkdir_p} {dir} {
+	exec /mod/bin/busybox/mkdir -p $dir
+}
+
+proc {system dirblockers} {dir {permitted {".*"}}} {
+	set fl {}
+	foreach e [readdir -nocomplain $dir] {
+		if {$e in {. ..}} continue
+		if {[file isdirectory "$dir/$e"]} {
+			lappend fl $e
+			continue
+		}
+		set flag 1
+		foreach p $permitted {
+			if {[string match -nocase $p $e]} {
+				set flag 0
+				break
+			}
+		}
+		if {$flag} {
+			lappend fl $e
+		}
+	}
+	return $fl
+}
+
+proc {system rmdir_if_empty} {dir {permitted {".*"}}} {
+	set fl [system dirblockers $dir $permitted]
+
+	if {![llength $fl]} {
+		file delete -force $dir
+		return 1
+	}
+	return 0
+}
+
+proc {system listening} {{mport 0}} {
+	set ret {}
+	foreach line [split [exec /mod/bin/busybox/netstat -lntpw] "\n"] {
+		# Remove repeated spaces
+		regsub -all -- {[[:space:]]+} $line " " line
+# tcp 0 0 0.0.0.0:9955 0.0.0.0:* LISTEN 169/humaxtv
+		lassign [split $line " "] x x x port x type app
+		if {$type ne "LISTEN"} { continue }
+		lassign [split $port ":"] x port
+
+		if {$mport && $mport != $port} { continue }
+		lappend ret [list $port [split $app "/"]]
+	}
+	return $ret
+}
+
+proc {system is_listening} {mport} {
+	return [llength [system listening $mport]]
+}
+
+proc {system logtimestamp} {} {
+	return [clock format [clock seconds] -format "%d/%m/%Y %H:%M:%S"]
+}
+
+proc {system _log} {log msg} {
+	set logfd [open $log "a+"]
+	puts $logfd "[system logtimestamp] - $msg"
+	$logfd close
+}
+
+proc {system log} {log msg} {
+	system _log "/var/log/$log.log" $msg
+}
+
+proc {system plog} {log msg} {
+	system _log "/mod/tmp/$log.log" $msg
+}
+
+proc {system notify} {msg} {
+	system plog notify $msg
+}
+
+proc {system display} {hdr hd} {
+	if {[system model] eq "HDR"} {
+		exec /sbin/display $hdr
+	} else {
+		exec /sbin/display "\$$hd"
+	}
+}
+
+proc {system tuners} {} {
+	if {[system model] eq "HDR"} {
+		return 2
+	} else {
+		return 1
+	}
+}
+
+proc {system uptime} {} {
+	set fd [open /proc/uptime r]
+	set uptime [lindex [split [read $fd]] 0]
+	$fd close
+	return $uptime
+}
+
+proc {system filename} {str {extra ""}} {
+	# Humax TV replaces these characters.
+	# "%*./:<>?\|
+	set chars "\"%*\./:<>?\\\\|$extra"
+	return [regsub -all -- "\[$chars]" $str "_"]
+}
+
+proc {system connectivity} {{site "hpkg.tv"} {port 80} {ret "0"}} {
+	set extra [lassign [exec /mod/bin/tcpping $site $port] result]
+	if {$ret ne "0"} { upvar $ret err }
+	switch $result {
+		OK	{ return 1 }
+		default	{
+				set err [list $result $extra]
+				return 0
+		}
+	}
+}
+
+proc {system nuggeted} {} {
+	if {![system pkginst nugget]} { return 0 }
+	if {[system nugget ping] eq "PONG"} {
+		return 1
+	}
+	return 0
+}
+
+proc {system nugget} {args} {
+	if {[catch {set ret [exec /mod/bin/nugget {*}$args]} msg]} {
+		return ""
+	}
+	return $ret
+}
+
+proc {system strip} {str} {
+	if {[string range $str 1 2] eq "i7"} {
+		# ISO6937, convert to UTF-8
+		return [xconv [string range $str 3 end]]
+	}
+	if {[string first "\025" $str] == 0} {
+		# UTF-8
+		return [string range $str 1 end]
+	}
+	return [xconv $str]
+}
+
+proc {system usbdisks} {{full 0}} {
+	set disks [lmap i [glob -nocomplain \
+	    -directory /sys/bus/usb/drivers/usb-storage *:*] {
+		file tail $i
+	    }]
+	if {!$full} {
+		return [llength $disks]
+	}
+	if {![llength $disks]} { return {} }
+
+	# Build list of device to device ID
+	set map {}
+	foreach block [glob -nocomplain -directory /sys/block sd?] {
+		set link [file readlink $block/device]
+		foreach disk $disks {
+			if {[string first "/$disk/" $link] >= 0} {
+				set map([file tail $block]) $disk
+			}
+		}
+		
+	}
+	return $map
+}
+
+proc {system usbmounts} {{full 0}} {
+	if {!$full} {
+		set num 0
+		catch {
+			set num [
+			    exec grep -cE {^/dev/sd[a-z][1-9] /media/[^/]+ } \
+				/proc/mounts]
+		}
+		return $num
+	}
+	set ret {}
+	if {[catch {
+		set lines [exec grep -E {^/dev/sd[a-z][1-9] /media/[^/]+ } \
+		    /proc/mounts]
+	}]} { return $ret }
+	foreach line [split $lines "\n"] {
+		lassign $line dev mp
+		set rec "DEV {$dev} MP {$mp} LABEL {NO NAME} TYPE Unknown"
+
+		set rec(VENDOR) Unknown
+		set rec(MODEL) Unknown
+
+		if {[regexp {/dev/(sd[a-z])} $dev x rdev]} {
+			set rec(RDEV) $rdev
+			if {[file readable [
+			    set f /sys/block/$rdev/device/vendor]]} {
+				set rec(VENDOR) [string trim [file read $f]]
+			}
+			if {[file readable [
+			    set f /sys/block/$rdev/device/model]]} {
+				set rec(MODEL) [string trim [file read $f]]
+			}
+		}
+
+		lassign [exec stat -f -c {%S %b %f} $mp] blocks blockc blockf
+		set rec(SIZE) $($blockc * $blocks)
+		set rec(USED) $(100 - $blockf * 100 / $blockc)
+
+		# /dev/sda1: LABEL="SAN" UUID="DBC1-1CF8" TYPE="vfat"
+		catch {
+		  foreach field [
+		    split [exec /mod/sbin/blkid -c /dev/null $dev] "\n"] {
+			while {[regexp { *([A-Z]+)="?([^"]+)"?(.*)} \
+			    $field x k v field]} {
+				set rec($k) $v
+			}
+		  }
+		}
+		# Test for EXFAT
+		if {$rec(TYPE) eq "Unknown" && [
+		    file exists /mod/sbin/exfatlabel]} {
+		      catch {
+			set label [exec /mod/sbin/exfatlabel $dev 2>/dev/null]
+			if {$label ne ""} {
+				set rec(TYPE) "EXFAT"
+				set rec(LABEL) $label
+			}
+		      }
+		}
+
+		lappend ret $rec
+	}
+
+	return $ret
+}
+
+proc {system has} {comp} {
+	switch $comp {
+	    wifi_dongle {
+		if {[catch {exec /mod/bin/iwgetid}]} { return 0 }
+		return 1
+	    }
+	    tvdb {
+		require settings.class
+		return [[settings] _nval_setting tvdb]
+	    }
+	}
+	return 0
+}
+
+# Note that {system checkop} can be called from processes other than that
+# which started the operation. Hence no visilibty into the ::system::ops
+# dictionary.
+proc {system checkop} {op} {
+	if {![regexp -nocase -- {^[.a-z0-9]+$} $op]} { return 0 }
+	if {[catch {set fp [open "/tmp/.bgop.$op" "a"]}]} {
+		return 0
+	}
+	set ret 1
+	if {[$fp lock]} {
+		$fp unlock
+		set ret 0
+	}
+	$fp close
+	return $ret
+}
+
+set ::system::ops {}
+
+proc {system startop} {args op file} {
+	if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 }
+	if {"-multiple" in $args} {
+		set i 0
+		append op "[pid]."
+		while {[dict exists $::system::ops "$op$i"]} { incr i }
+		append op $i
+	} elseif {[dict exists $::system::ops $op]} {
+		system endop $op
+	}
+	if {[catch {
+		set fp [open "/tmp/.bgop.$op" "a"]
+		if {[$fp lock]} {
+			$fp puts "$file\n[pid]"
+			$fp flush
+			set ::system::ops($op) $fp
+		} else {
+			$fp close
+			error "Could not lock op file."
+		}
+	}]} { return 0 }
+	return $op
+}
+
+proc {system endop} {op} {
+	if {![regexp -nocase -- {^[.a-z0-9]+$} $op]} { return 0 }
+	if {[dict exists $::system::ops $op]} {
+		catch {
+			set fp $::system::ops($op)
+			$fp unlock
+			$fp close
+		}
+		dict unset ::system::ops $op
+	}
+	if {[file exists "/tmp/.bgop.$op"]} {
+		file delete "/tmp/.bgop.$op"
+		return 1
+	}
+	return 0
+}
+
+proc {system specialdir} {dir} {
+	if {[string match {\[*} [string trimleft [file tail $dir]]]} {
+		return 1
+	}
+	return 0
+}
+
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 05fd9d86..526814a5 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -339,7 +339,7 @@ ts method setgenre {newgenre} {
 }
 
 ts method dlnaloc {{urlbase ""}} {
-	return [system dlnaurl $file $urlbase]
+	return [system dlnaurl [file normalize $file] $urlbase]
 }
 
 ts method cleanbmp {} {
diff --git a/webif/lib/ts.class.orig b/webif/lib/ts.class.orig
new file mode 100644
index 00000000..05fd9d86
--- /dev/null
+++ b/webif/lib/ts.class.orig
@@ -0,0 +1,899 @@
+
+if {![exists -command class]} { package require oo }
+if {![exists -command pack]} { package require pack }
+if {![exists -command xconv]} { package require xconv }
+if {![exists -command binary]} { package require binary }
+
+source /mod/webif/lib/setup
+require system.class tvdb.class classdump
+
+set tsgroup {ts nts hmt thm}
+
+class ts {
+	file		""
+	base		""
+	title		""
+	synopsis	""
+	definition	""
+	channel_num	0
+	channel_name	""
+	start		0
+	end		0
+	flags		""
+	error		""
+	guidance	""
+	bookmarks	0
+	schedstart	0
+	scheddur	0
+	genre		0
+	resume		0
+	status		""
+	series		""
+
+	seriescached	1
+	seriesnum	0
+	episodenum	0
+	episodetot	0
+	episodename	""
+	tvdb_method	""
+	tvdb_series	{}
+	tvdb_data	{}
+}
+
+ts method bfile {} {
+	return [file tail [file rootname $file]]
+}
+
+ts method dir {} {
+	return [file dirname $file]
+}
+
+ts method duration {{raw 0}} {
+	set d [expr $end - $start]
+	if {!$raw} { set d $($d / 60) }
+	return $d
+}
+
+ts method size {} {
+	return [file size $file]
+}
+
+ts method _parse {line} {
+	set vars [split $line "\t"]
+
+	lassign [split $line "\t"] \
+	    title synopsis definition channel_num channel_name \
+	    start end flags_list guidance bookmarks schedstart scheddur \
+	    genre resume status seriesnum episodenum episodetot
+
+	set synopsis [xconv $synopsis]
+
+	set flags [split [string range $flags_list 0 end-1] ,]
+}
+
+ts method lastmod {} {
+	return [file mtime "[file rootname $file].hmt"]
+}
+
+ts method inuse {} {
+	return [system inuse $file]
+}
+
+ts method bookmarks {{aslist 0}} {
+	set marks [split [string trim [exec /mod/bin/hmt -bookmarks $file]]]
+	if {$aslist} { return $marks }
+	return [join $marks " "]
+}
+
+ts method setbookmarks {marks} {
+	exec /mod/bin/hmt +setbookmarks=[join $marks :] $file
+}
+
+ts method storeepisode {{data {}}} {
+	if {[llength $data]} {
+		set d [join $data ","]
+	} else {
+		set d "$seriesnum,$episodenum,$episodetot"
+	}
+	exec /mod/bin/hmt +setseries=$d $file
+}
+
+ts method clearepdata {} {
+	set seriesnum 0
+	set episodenum 0
+	set episodetot 0
+}
+
+ts method flag {f} {
+	if {$f in $flags} {return 1} else {return 0}
+}
+
+ts method unflag {f} {
+	lremove flags $f
+}
+
+ts method unlock {} {
+	set cmd [list /mod/bin/hmt -lock $file]
+	exec {*}$cmd
+	lremove flags "Locked"
+	return 1
+}
+
+ts method lock {} {
+	set cmd [list /mod/bin/hmt +lock $file]
+	exec {*}$cmd
+	ladd flags "Locked"
+	return 1
+}
+
+set ::ts::flagmap {
+	detectads	Addetection
+	dedup		Deduped
+	encrypted	ODEncrypted
+	protect		Encrypted
+}
+
+ts method setflag {flag {dummy 0}} {
+	if {!$dummy} {
+		set cmd [list /mod/bin/hmt +$flag $file]
+		if {[catch {exec {*}$cmd}]} {
+			throw 20 "Unknown flag."
+		}
+	}
+	if {[dict exists $::ts::flagmap $flag]} {
+		ladd flags $::ts::flagmap($flag)
+	} else {
+		ladd flags [string totitle $flag]
+	}
+	return 1
+}
+
+ts method unsetflag {flag {dummy 0}} {
+	if {!$dummy} {
+		set cmd [list /mod/bin/hmt -$flag $file]
+		if {[catch {exec {*}$cmd}]} {
+			throw 20 "Unknown flag."
+		}
+	}
+	if {[dict exists $::ts::flagmap $flag]} {
+		lremove flags $::ts::flagmap($flag)
+	} else {
+		lremove flags [string totitle $flag]
+	}
+	return 1
+}
+
+ts method set_shrunk {} {
+	set cmd [list /mod/bin/hmt +shrunk $file]
+	exec {*}$cmd
+	ladd flags "Shrunk"
+	return 1
+}
+
+ts method set_deduped {} {
+	set cmd [list /mod/bin/hmt +dedup $file]
+	exec {*}$cmd
+	ladd flags "Deduped"
+	return 1
+}
+
+ts method unset_deduped {} {
+	set cmd [list /mod/bin/hmt -dedup $file]
+	exec {*}$cmd
+	lremove flags "Deduped"
+	return 1
+}
+
+ts method unenc {} {
+	set cmd [list /mod/bin/hmt -protect $file]
+	exec {*}$cmd
+	lremove flags "Encrypted"
+	return 1
+}
+
+ts method enc {} {
+	set cmd [list /mod/bin/hmt +protect $file]
+	exec {*}$cmd
+	ladd flags "Encrypted"
+	return 1
+}
+
+ts method set_new {} {
+	set cmd [list /mod/bin/hmt +new $file]
+	exec {*}$cmd
+	ladd flags "New"
+	return 1
+}
+
+ts method set_watched {} {
+	set cmd [list /mod/bin/hmt -new $file]
+	exec {*}$cmd
+	lremove flags "New"
+	return 1
+}
+
+ts method setfile {f} { set file $f }
+
+proc {ts parse} {file line} {
+	set e [ts new]
+	$e setfile $file
+	$e _parse $line
+	return $e
+}
+
+proc {ts exec} {file} {
+	set raw 0
+	set cmd [list /mod/bin/hmt]
+	lappend cmd "-p"
+	lappend cmd $file
+
+	#puts "CMD -$cmd-"
+
+	return [exec {*}$cmd]
+}
+
+ts method fileset {} {
+	global tsgroup
+
+	set root [file rootname $file]
+	set fset {}
+	foreach ext $tsgroup {
+		if {[file exists "$root.$ext"]} {
+			lappend fset "$root.$ext"
+		}
+	}
+	return $fset
+}
+
+proc {ts fetch_or_error} {file {checked 0}}  {
+	if {[catch {set ts [ts fetch $file $checked]}] || $ts == 0} {
+		print "Could not load ts file $file"
+		return 0
+	}
+	return $ts
+}
+
+proc {ts fetch} {file {checked 0}} {
+	# Check that this is a .ts file which has at least one sidecar
+	# file (.hmt)
+	if {!$checked} {
+		if {[file extension $file] ne ".ts"} { return 0 }
+		if {![file exists "[file rootname $file].hmt"]} { return 0 }
+	}
+
+	if {[file extension $file] ne ".ts"} {
+		set file "[file rootname $file].ts"
+	}
+
+	return [ts parse $file [ts exec $file]]
+}
+
+ts method delete {} {
+	foreach f [$self fileset] {
+		file tdelete $f
+		puts "Removed $f<br>"
+	}
+	return 1
+}
+
+ts method move {dst {touch 0} {force 0}} {
+	foreach f [$self fileset] {
+		set nf "$dst/[file tail $f]"
+		while {[file exists $nf]} {
+			set nf "$dst/_[file tail $nf]"
+		}
+		file rename $f $nf
+		if {$touch} {
+			exec /mod/bin/busybox/touch $nf
+		}
+	}
+	return 1
+}
+
+ts method copy {dst} {
+	foreach f [$self fileset] {
+		file copy $f "$dst/[file tail $f]"
+	}
+	return 1
+}
+
+ts method settitle {newtitle} {
+	if {[string length $newtitle] > 48} { return }
+
+	exec /mod/bin/hmt "+settitle=${newtitle}" $file
+	set title $newtitle
+}
+
+ts method setsynopsis {newsynopsis} {
+	if {[string length $newsynopsis] > 252} { return }
+
+	exec /mod/bin/hmt "+setsynopsis=${newsynopsis}" $file
+	set synopsis $newsynopsis
+}
+
+ts method setguidance {newguidance} {
+	if {[string length $newguidance] > 74} { return }
+
+	if {$newguidance eq ""} {
+		exec /mod/bin/hmt "-guidance" $file
+	} else {
+		exec /mod/bin/hmt "+setguidance=${newguidance}" $file
+	}
+	set guidance $newguidance
+}
+
+proc {ts genre} {genre} {
+	if {![string is integer $genre] || $genre < 0} {
+		set genre 0
+	}
+	if {$genre <= 15} {
+		set genre $($genre << 4)
+	}
+	return $genre
+}
+
+ts method setgenre {newgenre} {
+	set newgenre [ts genre $newgenre]
+	exec /mod/bin/hmt "+setgenre=-${newgenre}" $file
+	set genre $newgenre
+}
+
+ts method dlnaloc {{urlbase ""}} {
+	return [system dlnaurl $file $urlbase]
+}
+
+ts method cleanbmp {} {
+	set bfile [file rootname $file]
+	foreach f [glob -nocomplain "${bfile}*.bmp"] {
+		file delete $f
+	}
+}
+
+ts method mkbmps {{offset 0}} {
+	set bfile [file rootname $file]
+	if {[catch {
+	    exec /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
+	    -vf fps=fps=2 -frames 5 \
+	    -pix_fmt argb -vf vflip -s 140x78 "${bfile}%d.bmp"
+	} msg]} {
+		puts "ERROR: $msg"
+		return 0
+	}
+	return 1
+}
+
+ts method mkbmp {{offset 0} {ext ""}} {
+	set bfile [file rootname $file]
+	set bmpfile "$bfile$ext.bmp"
+	set cmd [list /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
+	    -frames 1 -pix_fmt argb -vf vflip -s 140x78 -y $bmpfile]
+	catch { exec {*}$cmd }
+	if {![catch { file stat $bmpfile stbmp }]} {
+		if {[dict get $stbmp size] != 0} { return 1 }
+	}
+	return 0
+}
+
+ts method mkthm {{offset 0}} {
+	if {![$self mkbmp $offset]} { return 0 }
+	set bfile [file rootname $file]
+	# Trim the bitmap header from the start of the file
+	if {[catch {
+	    exec /bin/dd if=$bfile.bmp of=$bfile.thm~ bs=54 skip=1
+	    } msg]} {
+		puts "ERROR: $msg"
+		return 0
+	}
+	exec /bin/echo -n " " >> $bfile.thm~
+	file rename -force $bfile.thm~ $bfile.thm
+	file tdelete $bfile.bmp
+	$self setflag thumbnail
+	return 1
+}
+
+# From MontysEvilTwin
+# - https://hummy.tv/forum/threads/7787/page-2#post-106826
+# ffmpeg -i "File 1.ts" -c:a mp3 -b:a 128k "File 1.mp3"
+# ffmpeg -i "File 1.ts" -c:a copy "File 1.mp2"
+# ffmpeg -i "File 1.ts" -c:a copy "File 1.loas"
+ts method mkmp3 {{slow false} {tmp ""} {v 0} {br 128}} {
+	set rfile [file rootname $file]
+
+	if {$slow} {
+		set opts [list -c:a mp3 -b:a ${br}k]
+		set ext mp3
+	} else {
+		set opts [list -c:a copy]
+		if {$definition eq "HD"} {
+			set ext loas
+		} else {
+			set ext mp2
+		}
+	}
+	set cmd [list /mod/bin/ffmpeg \
+	    -y -benchmark -vn -v $v \
+	    -i $file {*}$opts \
+	]
+
+	if {$tmp eq ""} {
+		lappend cmd "${rfile}.$ext"
+	} else {
+		lappend cmd "$tmp.$ext"
+	}
+
+	set output [exec {*}$cmd]
+
+	if {$tmp ne ""} {
+		file rename "$tmp.$ext" "${rfile}.mp3"
+	} elseif {$ext ne "mp3"} {
+		file rename "${rfile}.$ext" "${rfile}.mp3"
+	}
+
+	exec /mod/bin/id3v2 \
+	    --song $title \
+	    --comment $synopsis \
+	    --album $channel_name \
+	    --year "[clock format $start -format {%Y}]" \
+	    "${rfile}.mp3"
+
+	return $output
+}
+
+ts method mkmpg {{tmp ""}} {
+	set rfile [file rootname $file]
+
+	set cmd [list /mod/bin/ffmpeg \
+	    -y -benchmark -v 0 \
+	    -i $file \
+	    -map 0:0 -map 0:1 \
+	    -vcodec copy -acodec copy]
+
+	if {$tmp eq ""} {
+		lappend cmd "${rfile}.mpg"
+	} else {
+		lappend cmd "$tmp.mpg"
+	}
+
+	set output [exec {*}$cmd]
+
+	if {$tmp ne ""} {
+		file rename "$tmp.mpg" "${rfile}.mpg"
+	}
+
+	return $output
+}
+
+proc {ts renamegroup} {from to} {
+	global tsgroup
+
+	set dir [file dirname $from]
+	set root [file rootname $from]
+
+	# Catch from string without a . character in it
+	if {$root eq $from} { return }
+
+	foreach ext $tsgroup {
+		set f "$root.$ext"
+		if {![file exists $f]} continue
+		file rename $f "${dir}/${to}.${ext}"
+	}
+
+	exec /mod/bin/hmt "+setfilename=$to" "${dir}/${to}.hmt"
+
+#	set ndir [file normalize $dir]
+#
+#	if {![catch {set db [sqlite3.open $::dmsfile]}]} {
+#	    catch {
+#		set x [lindex [$db query {select mediaid from tblMedia
+#		    where localUrl = '%s'} [file normalize $from]] 0]
+#		lassign $x key mediaid
+#		if {$mediaid ne ""} {
+#			$db query {update tblMedia set localUrl = '%s'
+#			    where mediaid = %s} "${ndir}/{$to}.ts" $mediaid
+#			$db query {update tblMedia set title = '%s'
+#			    where mediaid = %s} "{$to}.ts" $mediaid
+#		}
+#	    }
+#	$db close
+#	}
+}
+
+proc {ts touchgroup} {target ref} {
+	global tsgroup
+
+	set dir [file dirname $target]
+	set root [file rootname $target]
+
+	# Catch from string without a . character in it
+	if {$root eq $target} { return }
+
+	foreach ext $tsgroup {
+		set f "$root.$ext"
+		if {![file exists $f]} continue
+		file touch $f $ref
+	}
+}
+
+proc {ts resetnew} {dir} {
+	if {![file isdirectory $dir]} return
+	if {![file exists "$dir/.series"]} {
+		set fd [open "$dir/.series" "w"]
+		puts -nonewline $fd [string repeat "\x0" 276]
+		close $fd
+	}
+
+	set tot 0
+	set watched 0
+	foreach file [readdir -nocomplain $dir] {
+		if {![string match {*.ts} $file]} { continue }
+		incr tot
+		if {[set ts [ts fetch "$dir/$file"]] != 0} {
+			if {![$ts flag "New"]} { incr watched }
+		}
+	}
+
+	if {!$tot} {
+		file delete "$dir/.series"
+		return
+	}
+
+	set fd [open "$dir/.series"]
+	set bytes [read $fd]
+	close $fd
+	set recs [unpack $bytes -uintle 0 32]
+	set played [unpack $bytes -uintle 32 32]
+
+	#puts "Current: $played/$recs"
+	#hexdump $bytes
+	#puts "Calculated: $watched/$tot"
+
+	pack bytes $tot -intle 32 0
+	pack bytes $watched -intle 32 32
+
+	#hexdump $bytes
+
+	set fd [open "$dir/.series" "w"]
+	puts -nonewline $fd $bytes
+	close $fd
+}
+
+proc {ts iterate} {callback {verbose 0} {dir ""} {nospecial 0}} {{rootdev 0}} {
+	require system.class
+	if {$dir eq ""} {
+		set dir [system mediaroot]
+		file stat "$dir/" rootstat
+		set rootdev $rootstat(dev)
+	}
+
+	if {$verbose} { puts "Scanning directory ($dir)" }
+
+	if {$rootdev != 0} {
+		file stat "$dir/" st
+		if {$st(dev) != $rootdev} return
+	}
+
+	if {$nospecial && [system specialdir $dir]} return
+
+	foreach entry [readdir -nocomplain $dir] {
+		if {[file isdirectory "$dir/$entry"]} {
+			ts iterate $callback $verbose "$dir/$entry" $nospecial
+			continue
+		}
+		if {![string match {*.ts} $entry]} continue
+		if {[catch {set ts [ts fetch "$dir/$entry"]}]} continue
+		if {$ts == 0} continue
+                $callback $ts
+	}
+}
+
+#
+# Attempt to extract the series/episode names using a variety of techniques
+#
+
+ts method series_name {} {
+
+	# For recorded series, use the folder name
+	set dir [file dirname $file]
+	if {[file exists "$dir/.series"]} {
+		set s [file tail $dir]
+	} else {
+		set s $title
+	}
+
+	foreach x {
+		{^new: *}
+	} {
+		regsub -nocase -all -- $x $s "" s
+	}
+
+	return $s
+}
+
+set ::ts::episode_prefixes {
+	{^new series\.* *}
+	{^cbeebies\.* *}
+	{^cbbc\.* *}
+	{^t4: *}
+	{^brand new series *[-:]* *}
+	{^\.+}
+	{ *\(Part [0-9] of [0-9]\) *}
+	{, Part [0-9]}
+}
+
+ts method _tvdb_resolve {seriesid} {
+	# See if we can find a TVDB series for this recording.
+
+	set dir [file dirname $file]
+
+	set tvdb_series [set v [tvdb series "" $seriesid]]
+	if {[$v get seriesid] == 0} { return }
+
+	# Got one.
+
+	# Easiest case - we can explicitly request the episode.
+	if {$seriesnum && $episodenum} {
+		if {$seriescached} {
+			set tvdb_method "cached values"
+		} else {
+			set tvdb_method "series and episode number"
+		}
+		return [$v episodebynum $seriesnum $episodenum]
+	}
+
+	# Now try to find the episode using the current episode name
+	# (using series or episode number if available)
+	set k [$v episodebyname $episodename $seriesnum $episodenum]
+	if {[llength $k]} {
+		set tvdb_method "episode name ($episodename)"
+		return $k
+	}
+
+	# More problematic but can at least narrow the list of candidates
+	# using the episode or series numbers if we have them.
+
+	if {$episodenum} {
+		set tvdb_method "episode number"
+		return [$v episodebyepnum $episodenum $synopsis]
+	}
+
+	if {$seriesnum} {
+		set tvdb_method "series and synopsis"
+		return [$v episodebyseries $seriesnum $synopsis]
+	}
+
+	# Most difficult - try and match based on synopsis alone
+	set tvdb_method "synopsis text"
+	return [$v episodebysynopsis $synopsis]
+}
+
+proc {ts serieslist} {dir} {
+	set idfile "$dir/.tvdbseriesid"
+	if {![file exists $idfile]} { return {} }
+	return [lmap i [split [file read $idfile] "\n"] {
+		string trim $i
+	}]
+}
+
+ts method extract_numbers {} {
+
+	######################################################################
+	# Check for embedded Series/Episode number.
+	# Thank you broadcasters for the variation!
+	# Least trustworthy first.
+
+	# Episode 5
+	regexp -nocase -- {Episode (\d+)} $synopsis x episodenum
+
+	# ^23/27.
+	regexp -nocase -- {^\s*(\d+)/(\d+)} $synopsis x episodenum episodetot
+
+	# (8/8)
+	regexp -nocase -- {\((\d+)/(\d+)\)} $synopsis x episodenum episodetot
+
+	# (Episode 5/10)
+	# (Ep5/10)
+	# (Ep 3 of 3)
+	# (Ep3)
+	regexp -nocase -- {Epi?s?o?d?e?\s*(\d+)\s*(of|/)?\s*(\d+)?} $synopsis \
+	    x episodenum x episodetot
+
+	# (S2 Ep1)
+	# S.02 Ep.002
+	# S01 Ep52
+	# (S4 Ep 7)
+	# (S1, ep 2)
+	# (S8, Ep2)
+	# (S4 Ep22/24)
+	regexp -nocase -- {S\.*(\d+),?\s*Ep\.?\s*(\d+)(/(\d+))?} $synopsis \
+	    x seriesnum episodenum x episodetot
+
+    # (Part 5/10)
+	# (Pt. 5/10)
+	# (Part 5 of 10)
+	# (Pt. 5 of 10)
+	# (Pt5)
+	regexp -nocase -- {P(art|t\.?)\s*(\d+)\s*(of|/)?\s*(\d+)?} $synopsis \
+		x x episodenum x episodetot
+
+	foreach v {seriesnum episodenum episodetot} {
+		if {[set $v] eq ""} {
+			set $v 0
+		} else {
+			incr $v 0
+		}
+	}
+
+}
+
+ts method episode_name {} {
+	set s $synopsis
+
+	######################################################################
+	# Attempt to determine the episode name from the synopsis
+
+	# Strip common prefixes
+	foreach prefix $::ts::episode_prefixes {
+		regsub -nocase -all -- $prefix $s "" s
+	}
+
+	# Strip anything following a colon.
+	regsub -all -- { *[:].*$} $s "" s
+
+	# If the resulting string is longer than 40 characters then
+	# split around . and take the left hand side if appropriate.
+	if {[string length $s] > 40} {
+		lassign [split $s "."] v w
+		set s $v
+		if {[string length $s] < 6 && [string length $w] < 6} {
+			append s "_$w"
+		}
+	}
+
+	# Shorten if too long.
+	if {[string length $s] > 40} { set s [string range $s 0 39] }
+
+	set episodename $s
+
+	if {$episodenum == 0} {
+		$self extract_numbers
+		set seriescached 0
+	}
+
+	# Now see if TVDB has anything to add
+
+	set fbase "[file dirname $file]/.tvdb"
+
+	if {![system has tvdb] || ![file exists "${fbase}seriesid"]} {
+		return $s
+	}
+
+	if {!$seriesnum && [file exists "${fbase}series"]} {
+		set seriesnum [string trim [file read "${fbase}series"]]
+	}
+	foreach seriesid [ts serieslist [$self dir]] {
+		set tvdb_data [$self _tvdb_resolve $seriesid]
+		if {![dict exists $tvdb_data name]} continue
+		set flag 0
+		if {!$seriesnum} {
+			set seriesnum $tvdb_data(series)
+			incr flag
+		}
+		if {!$episodenum} {
+			set episodenum $tvdb_data(episode)
+			incr flag
+		}
+		if {$flag} { $self storeepisode }
+
+		return $tvdb_data(name)
+	}
+
+	return $s
+}
+
+ts method epstr {{format "s%se%E/%n"}} {
+	set map {}
+	if {$seriesnum eq 0} {
+		set map(%s) "?"
+		set map(%S) "??"
+	} else {
+		set map(%s) $seriesnum
+		set map(%S) [format "%02d" $seriesnum]
+	}
+	if {$episodenum eq 0} {
+		set map(%e) "?"
+		set map(%E) "??"
+	} else {
+		set map(%e) $episodenum
+		set map(%E) [format "%02d" $episodenum]
+	}
+	if {$episodetot eq 0} {
+		set map(%n) "?"
+		set map(%N) "??"
+	} else {
+		set map(%n) $episodetot
+		set map(%N) [format "%02d" $episodetot]
+	}
+	return [string map $map $format]
+}
+
+ts method tsr {} {
+	set fd [open "[file rootname $file].nts"]
+	set bytes [read $fd 0x20]
+	close $fd
+	set tsr [unpack $bytes -uintle $(8 * 0x1f) 8]
+	return $tsr
+}
+
+ts method genrenib {} {
+	if {[catch {set v $($genre >> 4)}]} { set v 0 }
+	return $v
+}
+
+ts method genre_info {} {
+	set g [$self genrenib]
+	lassign $::epg::genrelist($g) txt img
+	if {$img eq "Unclassified"} {
+		set img "/images/173_3_26_G3_$img.png"
+	} else {
+		set img "/images/173_3_00_G3_$img.png"
+	}
+	return [list $txt $img]
+}
+
+proc {ts genrelist} {} {
+	require epg.class
+	set glist {}
+	foreach {k v} $::epg::genrelist {
+		lappend glist $($k << 4) $v
+	}
+	return $glist
+}
+
+# return the key that will decrypt the file in the mode, or nothing
+ts method getkey {mode} {
+	# mode: dlna (active key), direct
+
+	set rfile [file rootname $file]
+
+	set keys {}
+	# the active key
+	set key [string range [system nugget cryptokey -key] 0 31]
+	if {$key ne ""} {
+		lappend keys $key
+	}
+	if { $mode ne "dlna" } {
+		# also try other keys, such as this - same as active?
+		set key [system customencryptionkey]
+		if {$key ne ""} {
+			ladd keys $key
+		}
+
+		# the native key
+		if {![catch {set key [system encryptionkey]}]} {
+			ladd keys $key
+		}
+
+		# support a file listing other keys in hex, one-per-line
+		# eg, for recordings imported from a broken box
+		try {
+			set fd [open "/mod/etc/keys" r]
+			foreach key [split [$fd read -nonewline] "\n"] {
+				ladd keys $key
+			}
+		} on error {} {
+		} finally {
+			catch {$fd close}
+		}
+	}
+
+	foreach key $keys {
+		if {[catch {
+			set ret [exec /mod/bin/stripts -q/ $key $rfile]
+		}]} continue
+		if {$ret eq "1"} {
+			return $key
+		}
+	}
+	return
+}
+

From 7f1d68bf3a03f9367132d2a805773c481b7f5bd2 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:40:03 +0000
Subject: [PATCH 89/91] Remove .orig files

---
 webif/lib/system.class.orig | 921 ------------------------------------
 webif/lib/ts.class.orig     | 899 -----------------------------------
 2 files changed, 1820 deletions(-)
 delete mode 100644 webif/lib/system.class.orig
 delete mode 100644 webif/lib/ts.class.orig

diff --git a/webif/lib/system.class.orig b/webif/lib/system.class.orig
deleted file mode 100644
index 9da71279..00000000
--- a/webif/lib/system.class.orig
+++ /dev/null
@@ -1,921 +0,0 @@
-
-source /mod/webif/lib/setup
-
-package require xconv
-
-if {![exists -command class]} { package require oo }
-if {![exists -command sqlite3.open]} { package require sqlite3 }
-if {![exists -command binary]} { package require binary }
-
-class system {}
-
-proc {system model} {} {{model ""}} {
-	if {$model ne ""} { return $model }
-	if {[catch {set fp [open /etc/model r]}]} {
-		set model {HD[R]}
-	} else {
-		set model [string trim [read $fp]]
-		close $fp
-	}
-	return $model
-}
-
-proc {system hostname} {} {
-	if {[catch {set hostname [string trim [exec hostname]]}]} {
-		set hostname "humax"
-	}
-	return $hostname
-}
-
-proc {system ip} {} {
-	if {[catch {set fp [open /etc/hosts r]}]} {
-		set ip "127.0.0.1"
-	} else {
-		set ipl [lindex [split [$fp read] "\n"] 1]
-		regsub -- {[[:space:]].*} $ipl "" ip
-		$fp close
-	}
-	return $ip
-}
-
-proc {system modversion} {{short 0}} {{modver ""}} {
-	if {$modver eq ""} {
-		if {[catch {set fp [open /etc/modversion r]}]} {
-			set modver "102"
-		} else {
-			set modver [string trim [read $fp]]
-			close $fp
-		}
-	}
-	if {$short} { return $modver }
-	lassign [split $modver ""] a b c
-	return [format "%d.%d%d" $a $b $c]
-}
-
-proc {system modbuild} {} {{modbuild ""}} {
-	if {$modbuild ne ""} { return $modbuild }
-	if {[catch {set modbuild [string trim [file read /etc/modbuild]]}]} {
-		set modbuild 0
-	}
-	return $modbuild
-}
-
-proc {system lastbootreason} {{descr 1}} {{lbr -1}} {
-	if {$lbr == -1} {
-		set lbr 0
-		if {[file readable /tmp/.lbr]} {
-			set lbr [file read /tmp/.lbr]
-		}
-	}
-	if {!$descr} { return $lbr }
-	switch $lbr {
-		1 { return "Front panel button" }
-		2 { return "Remote control handset" }
-		3 { return "Scheduled event" }
-		4 { return "Power cycle" }
-	}
-	return "Unknown ($lbr)"
-}
-
-proc {system idletime} {} {
-	if {[file exists "/tmp/.lastir"]} {
-		return $([clock seconds] - [file mtime "/tmp/.lastir"])
-	}
-	return 0
-}
-
-proc {system fhtcpversion} {} {{ver ""}} {
-	if {$ver ne ""} { return $ver }
-	set file "/etc/fhtcpversion"
-	if {![file exists $file]} { set file "/root/fhtcpversion" }
-	if {[catch {set fp [open $file r]}]} {
-		set ver "?.??.??"
-	} else {
-		set ver [string trim [read $fp]]
-		close $fp
-	}
-	return $ver
-}
-
-#  :c0400	System ID
-# 4:c8400	read 1128 bytes
-# 3:c8c00	MAC address
-# 2:c9000
-# 1:cb400	DTCP key material
-# 0:cb800	Serial Number
-# 5:cbc00
-
-proc {system systemid} {} {{id ""}} {
-	if {$id ne ""} { return $id }
-	set fd [open /dev/mtd3 r]
-	
-	$fd seek 0xc0400
-	set bytes [$fd read 4]
-	$fd close
-	binary scan $bytes H* hex
-	set id [format "%s.%s" [string range $hex 0 3] [string range $hex 4 end]]
-	return $id
-}
-
-proc {system macaddr} {} {{mac ""}} {
-	if {$mac ne ""} { return $mac }
-	set fd [open /dev/mtd3 r]
-	
-	$fd seek 0xc8c00
-	set bytes [$fd read 6]
-	$fd close
-	set tmac ""
-	foreach b [split $bytes ""] {
-		binary scan $b H* hex
-		if {$tmac ne ""} { append tmac : }
-		append tmac $hex
-	}
-	return [set mac $tmac]
-}
-
-proc {system serialno} {} {{serial ""}} {
-	if {$serial ne ""} { return $serial }
-	set fd [open /dev/mtd3 r]
-	
-	$fd seek 0xcb800
-	set bytes [$fd read 14]
-	$fd close
-	set serial "[string range $bytes 0 1] [string range $bytes 2 8] [
-	    string range $bytes 9 end]"
-	return $serial
-}
-proc {system keybytestostring} {key_bytes} {
-	binary scan $key_bytes H* key_str                         
-	if {[string length $key_str] == 32} {                    
-		return $key_str
-	}
-	return {}
-}                                                     
-
-proc {system encryptionkey} {} {{key ""}} {
-	if {$key ne ""} { return $key }
-	set fd [open /dev/mtd3 r]
-	$fd seek 0xc8c00
-	set bytes [$fd read 6]
-	$fd seek 0xcb800
-	append bytes [$fd read 10]
-	$fd close
-	return [system keybytestostring $bytes]
-}
-
-proc {system customencryptionkey} {{key ""}} {{keyfile "/mod/boot/cryptokey"}} {
-
-        set ck_fd {}
-        try {
-            if {$key eq ""} {
-                set ck_fd [open $keyfile r]
-                set ck_bytes [$ck_fd read 16]
-                return [system keybytestostring $ck_bytes]
-            } elseif {[string equal -nocase $key [system encryptionkey]]} {
-                file delete -force $keyfile
-                return $key
-            } else {
-                set ck_bytes [binary format H* $key]
-                set test [system keybytestostring $ck_bytes]
-                if {![string equal -nocase $test $key]} {
-                    throw 1 "Invalid custom key"
-                }
-                if {[file exists $keyfile]} {
-                    # attempt not to truncate on update until written
-                    set access r+
-                } else {
-                    set access w
-                }
-                set ck_fd [open $keyfile $access]
-                $ck_fd seek 0
-                $ck_fd puts -nonewline $ck_bytes
-                $ck_fd close
-                set ck_fd {}
-                return $key
-            }
-        } on error {msg opts} {
-           return {}
-        } finally {
-            if {$ck_fd ne {}} {
-                $ck_fd close
-            }
-        }
-}
-
-proc {system loaderver} {} {{ver ""}} {
-	if {$ver ne ""} { return $ver }
-	set fd [open /dev/mtd3 r]
-	$fd seek 0x20006
-	set bytes [$fd read 2]
-	$fd close
-	set ver [switch $bytes {
-		"\x04\x5f" { format "a7.30" }
-		"\xec\xe5" { format "a7.31" }
-		"\x59\x9d" { format "a7.33" }
-		"\x72\x5c" { format "a7.34" }
-		"\xe5\xe3" { format "L7.26" }
-		"\x8f\x7c" { format "L7.27" }
-		default {
-			binary scan $bytes H* hex
-			format "Unknown - $hex"
-		}
-	}]
-	return $ver
-}
-
-proc {system kernelver} {} {{ver ""}} {
-	if {$ver ne ""} { return $ver }
-	#1 SMP Sun Mar 25 18:30:38 KST 2012
-	set rver [string range [exec uname -v] 11 end]
-	set ver [switch $rver {
-		# HDR
-		"Sep 16 20:17:56 KST 2010" { format "HDR_1.01.05" }
-		"Oct 11 21:11:05 KST 2010" { format "HDR_1.01.09" }
-		"Jan 21 15:44:39 KST 2011" { format "HDR_1.02.07" }
-		"Jun 11 00:54:19 KST 2011" { format "HDR_1.02.20" }
-		"Mar 25 18:30:38 KST 2012" { format "HDR_1.02.27" }
-		"May 27 00:19:34 KST 2012" { format "HDR_1.02.28" }
-		"Jul 5 11:11:28 KST 2012"  { format "HDR_1.02.29" }
-		"Jan 12 16:49:05 KST 2013" { format "HDR_1.02.32" }
-		"Mar 6 07:27:02 KST 2013"  { format "HDR_1.03.06(a)" }
-		"May 8 14:32:30 KST 2013"  { format "HDR_1.03.06(b)" }
-		"Dec 10 14:36:54 KST 2013" { format "HDR_1.03.11" }
-		"Feb 7 14:15:02 KST 2014"  { format "HDR_1.03.12" }
-		"May 19 22:39:27 BST 2014" { format "HDR_CFW_3.00" }
-		"Feb 19 20:58:57 GMT 2015" { format "HDR_CFW_3.03" }
-		"Mar 11 23:34:27 GMT 2016" { format "HDR_CFW_3.10" }
-		"Mar 11 23:37:22 GMT 2016" { format "HDR_CFW_3.10d" }
-		"Jan 9 04:46:49 GMT 2017"  { format "HDR_CFW_3.11" }
-		"Jan 9 04:50:13 GMT 2017"  { format "HDR_CFW_3.11d" }
-		"Mar 23 19:36:14 GMT 2017" { format "HDR_CFW_3.12" }
-		"Mar 23 19:39:44 GMT 2017" { format "HDR_CFW_3.12d" }
-		"Apr 18 22:42:30 BST 2017" { format "HDR_CFW_3.13" }
-		"Apr 18 22:45:34 BST 2017" { format "HDR_CFW_3.13d" }
-		"Mar 29 13:48:27 BST 2020" { format "HDR_CFW_3.14" }
-		"Mar 29 13:52:16 BST 2020" { format "HDR_CFW_3.14d" }
-
-		# HD
-		"Oct 11 21:14:31 KST 2010" { format "HD_1.01.12" }
-		"May 17 14:16:20 KST 2011" { format "HD_1.02.18" }
-		"Jun 11 00:54:19 KST 2011" { format "HD_1.02.20" }
-		"Mar 25 07:09:19 KST 2012" { format "HD_1.02.27" }
-		"May 27 00:19:40 KST 2012" { format "HD_1.02.28" }
-		"Jul 5 19:41:17 KST 2012"  { format "HD_1.02.29" }
-		"Oct 13 12:48:09 KST 2012" { format "HD_1.02.31" }
-		"Dec 9 14:15:07 KST 2014"  { format "HD_1.03.02" }
-
-		default { format "Unknown - $rver" }
-	}]
-	return $ver
-}
-
-# Newer version below is over 100 times faster
-#proc {system pkgver} {{pkg webif}} {
-#	return [lrange [split [exec opkg list-installed $pkg] " "] 2 end]
-#}
-
-proc {system pkgver} {{pkg webif}} {
-	if {[catch {set fp [open /mod/var/opkg/info/$pkg.control r]}]} {
-		return 0
-	}
-
-	set v 0
-	foreach line [split [$fp read] "\n"] {
-		if {[string equal -length 9 $line "Version: "]} {
-			lassign $line x v
-			break
-		}
-	}
-	$fp close
-	return $v
-}
-
-proc {system pkginst} {pkg} {
-	return [file exists "/mod/var/opkg/info/$pkg.control"]
-}
-
-proc {system mediaroot} {} {
-	switch [system model] {
-		HDR { return "/media/My Video" }
-		HD { return "/media/drive1/Video" }
-	}
-	return ""
-}
-
-proc {system dlnastatus} {} {
-	return [system is_listening 9000]
-}
-
-proc {system dlnadb} {} {
-	switch [system model] {
-		HDR { return "/mnt/hd2/dms_cds.db" }
-		HD { return "/media/drive1/dms_cds.db" }
-	}
-	return ""
-}
-
-proc {system _dlnaurl} {file urlbase} {
-	set mime "video/mp2t"
-	set nfile $file
-	if {![catch {set nfile [file normalize $file]}]} {
-		set file $nfile
-	}
-	if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
-		return {}
-	}
-	set muri [$db query {
-	    select tblresource.mimetype, contenturi
-	    from tblresource join tblmedia using (mediaid)
-	    where localurl = '%s'} $file]
-	if {[llength $muri]} {
-		lassign [lindex $muri 0] x maybemime x xuri
-		if {$maybemime ne "video/ts"} {
-			set mime $maybemime
-		}
-	} else {
-		# Try for partially linked entry
-		set muri [$db query {
-			select mediaid from tblmedia
-			where localurl = '%s'
-		    } $file]
-		if {![llength $muri]} { return {} }
-		lassign [lindex $muri 0] x mediaid
-		set xuri "media/$mediaid.TS"
-	}
-
-	$db close
-
-	set url "http://${urlbase}:9000/web/$xuri"
-
-	return [list $url $mime]
-}
-
-proc {system dlnaurl} {file {urlbase "127.0.0.1"}} {
-	if {$urlbase eq ""} { set urlbase [system ip] }
-	set retries 5
-	set ret {}
-	while {$retries > 0 && [\
-	    catch {set ret [system _dlnaurl $file $urlbase]}]} {
-		incr retries -1
-		sleep 1
-	}
-	return $ret
-}
-
-proc {system dlnahelper} {file {urlbase "127.0.0.1"}} {
-	set dir /mnt/hd2/mod/.dlnahelper
-	require lock
-
-	if {$file eq "-release"} {
-		release_lock dlnahelper
-		return {}
-	}
-
-	if {![acquire_lock dlnahelper 2]} { return {} }
-
-	if {![file isdirectory $dir]} { file mkdir $dir }
-
-	set base [file rootname $file]
-	foreach ext {hmt ts} {
-		file delete "$dir/helper.$ext"
-		file link -symbolic "$dir/helper.$ext" "$base.$ext"
-	}
-
-	set ret [system dlnaurl "$dir/helper.ts" $urlbase]
-	if {![llength $ret]} {
-		# Manually import the helper file.
-		if {![catch {set db [sqlite3.open [system dlnadb]]}]} {
-			$db query {
-				insert into tblmedia
-				(localurl,folder,mediatype,refcount)
-				values('%s','%s',0,1)
-			} "$dir/helper.ts" $dir
-			$db close
-			set ret [system dlnaurl "$dir/helper.ts" $urlbase]
-		}
-	}
-	if {![llength $ret]} {
-		release_lock dlnahelper
-	}
-	return $ret
-}
-
-proc {system dustbin} {{short 0}} {
-	set dustbin "\[Deleted Items\]"
-	if {![catch {set fd [open "/mod/boot/dustbin.name" r]}]} {
-		set dustbin [lindex [split [read $fd] "\n"] 0]
-		$fd close
-	}
-	if {$short} { return $dustbin }
-	return "[system mediaroot]/$dustbin"
-}
-
-proc {system dustbinsize} {} {
-	set bin [system dustbin]
-	set ret 0
-	if {[file isdirectory $bin]} {
-		if {[catch {
-			lassign [exec /mod/bin/busybox/du -s $bin] ret
-		}]} {
-			set ret 0
-		}
-	}
-	return $($ret * 1024)
-}
-
-proc {system diskpart} {} {
-	switch [system model] {
-		HDR { return "/mnt/hd2" }
-		HD { return "/media/drive1" }
-	}
-	return ""
-}
-
-proc {system diskdev} {} {
-	return [lindex [lsearch -regexp -inline \
-	    [split [file read /proc/mounts] "\n\r"] " [system diskpart] "] 0]
-}
-
-proc {system disk} {} {
-	return [string range [system diskdev] 0 end-1]
-}
-
-proc {system disktemp} {} {
-	if {[catch {
-		set smart [exec /bin/smartctl -A [system disk] | grep ^194]
-		regsub -all -- {[[:space:]]+} $smart " " smart
-		set temp [lindex [split $smart] 9]
-	}]} {
-		set temp 0
-	}
-	return $($temp + 0)
-}
-
-proc {system tsrdir} {} {
-	switch [system model] {
-		HDR {
-			set tsrdir "/mnt/hd2/Tsr"
-		}
-		HD {
-			set tsrdir "/media/drive1/.tsr"
-		}
-	}
-	return $tsrdir
-}
-
-proc {system tsr} {} {
-	return [file join [system tsrdir] "0.ts"]
-}
-
-require pretty_size
-
-proc {system diskspace} {{raw 0}} {
-	set part [system diskpart]
-
-	lassign [exec /mod/bin/busybox/stat -f -c {%S %b %f} $part] \
-	    bsize blocks fblocks
-
-	set size $($bsize * $blocks)
-	set free $($bsize * $fblocks)
-	set used $($size - $free)
-	set perc $($used * 100 / $size)
-	set fperc $(100 - $perc)
-
-	set tsrdir [system tsrdir]
-	switch [system model] {
-		HDR {
-			set tsrok [file isdirectory $tsrdir]
-		}
-		HD {
-			set tsrok [file exists "$tsrdir/0.ts"]
-		}
-	}
-
-	if {$tsrok} {
-		set tsrbuf 21474836480
-		if {[catch {
-			lassign [exec du -ks $tsrdir] tsrused
-		}]} {
-			set tsrused 0
-			set tsrbuf 0
-		} else {
-			set tsrused $($tsrused * 1024)
-		}
-	} else {
-		set tsrbuf 0
-		set tsrused 0
-	}
-
-	if {!$raw} {
-		set size [pretty_size $size]
-		set free [pretty_size $free]
-		set used [pretty_size $used]
-		set tsrbuf [pretty_size $tsrbuf]
-		set tsrused [pretty_size $tsrused]
-	}
-
-	return [list $size $used $perc $free $fperc $tsrbuf $tsrused]
-}
-
-proc {system diskfree} {} {
-	lassign [exec /mod/bin/busybox/stat -f -c {%S %f} [system diskpart]] \
-	    bsize fblocks
-	return $($bsize * $fblocks)
-}
-
-proc {system busy} {} {
-	# Is humaxtv doing anything important?
-	if {[catch {set pid [exec /mod/bin/busybox/pgrep -n humaxtv]}]} {
-		return 0
-	}
-	set c 0
-	foreach line [split [\
-	    exec /mod/webif/lib/bin/lsof -X -Fn -p $pid] "\n"] {
-		if {[string match {*Video*.ts} $line]} { incr c }
-	}
-	if {$c > 0} { return 1 }
-	return 0
-}
-
-proc {system inuse} {file} {
-	if {![file exists $file]} { return 0 }
-	set op [exec /mod/webif/lib/bin/lsof -X -Fn $file]
-	switch -glob -- $op {
-		"" -
-		"*status error*" { return 0 }
-	}
-	return 1
-}
-
-proc {system dirinuse} {dir} {
-	set files {}
-	foreach line [split [\
-	    exec /mod/webif/lib/bin/lsof -X -Fn +d $dir] "\n"] {
-		if {[string index $line 0] ne "n"} continue
-		lappend files [file tail $line]
-	}
-	return $files
-}
-
-proc {system reboot} {{fast 0}} {
-	if {$fast} {
-		exec /mod/webif/lib/bin/reboot -f
-	} else {
-		exec /mod/webif/lib/bin/reboot
-	}
-}
-
-proc {system restartpending} {{mode 1}} {
-	if {$mode} {
-		close [open /tmp/.restartpending w]
-	} else {
-		file delete /tmp/.restartpending
-	}
-}
-
-proc {system param} {param {type Value} {tbl MENUCONFIG}} {
-	if {[catch {set db [sqlite3.open /var/lib/humaxtv/setup.db]} msg]} {
-		return 0
-	}
-	set val 0
-	set ret [$db query "
-		select item$type
-		from TBL_$tbl
-		where itemName = '$param'
-	"]
-	if {[llength $ret] == 1} {
-		lassign [lindex $ret 0] x val
-	}
-	$db close
-	return $val
-}
-
-proc {system padding} {} {
-	return [list \
-		[system param START_PADDING_TIME] \
-		[system param STOP_PADDING_TIME] \
-	]
-}
-
-proc {system instandby} {} {
-	return [system param LAST_STANDBY Value USERCONFIG]
-}
-
-proc {system mkdir_p} {dir} {
-	exec /mod/bin/busybox/mkdir -p $dir
-}
-
-proc {system dirblockers} {dir {permitted {".*"}}} {
-	set fl {}
-	foreach e [readdir -nocomplain $dir] {
-		if {$e in {. ..}} continue
-		if {[file isdirectory "$dir/$e"]} {
-			lappend fl $e
-			continue
-		}
-		set flag 1
-		foreach p $permitted {
-			if {[string match -nocase $p $e]} {
-				set flag 0
-				break
-			}
-		}
-		if {$flag} {
-			lappend fl $e
-		}
-	}
-	return $fl
-}
-
-proc {system rmdir_if_empty} {dir {permitted {".*"}}} {
-	set fl [system dirblockers $dir $permitted]
-
-	if {![llength $fl]} {
-		file delete -force $dir
-		return 1
-	}
-	return 0
-}
-
-proc {system listening} {{mport 0}} {
-	set ret {}
-	foreach line [split [exec /mod/bin/busybox/netstat -lntpw] "\n"] {
-		# Remove repeated spaces
-		regsub -all -- {[[:space:]]+} $line " " line
-# tcp 0 0 0.0.0.0:9955 0.0.0.0:* LISTEN 169/humaxtv
-		lassign [split $line " "] x x x port x type app
-		if {$type ne "LISTEN"} { continue }
-		lassign [split $port ":"] x port
-
-		if {$mport && $mport != $port} { continue }
-		lappend ret [list $port [split $app "/"]]
-	}
-	return $ret
-}
-
-proc {system is_listening} {mport} {
-	return [llength [system listening $mport]]
-}
-
-proc {system logtimestamp} {} {
-	return [clock format [clock seconds] -format "%d/%m/%Y %H:%M:%S"]
-}
-
-proc {system _log} {log msg} {
-	set logfd [open $log "a+"]
-	puts $logfd "[system logtimestamp] - $msg"
-	$logfd close
-}
-
-proc {system log} {log msg} {
-	system _log "/var/log/$log.log" $msg
-}
-
-proc {system plog} {log msg} {
-	system _log "/mod/tmp/$log.log" $msg
-}
-
-proc {system notify} {msg} {
-	system plog notify $msg
-}
-
-proc {system display} {hdr hd} {
-	if {[system model] eq "HDR"} {
-		exec /sbin/display $hdr
-	} else {
-		exec /sbin/display "\$$hd"
-	}
-}
-
-proc {system tuners} {} {
-	if {[system model] eq "HDR"} {
-		return 2
-	} else {
-		return 1
-	}
-}
-
-proc {system uptime} {} {
-	set fd [open /proc/uptime r]
-	set uptime [lindex [split [read $fd]] 0]
-	$fd close
-	return $uptime
-}
-
-proc {system filename} {str {extra ""}} {
-	# Humax TV replaces these characters.
-	# "%*./:<>?\|
-	set chars "\"%*\./:<>?\\\\|$extra"
-	return [regsub -all -- "\[$chars]" $str "_"]
-}
-
-proc {system connectivity} {{site "hpkg.tv"} {port 80} {ret "0"}} {
-	set extra [lassign [exec /mod/bin/tcpping $site $port] result]
-	if {$ret ne "0"} { upvar $ret err }
-	switch $result {
-		OK	{ return 1 }
-		default	{
-				set err [list $result $extra]
-				return 0
-		}
-	}
-}
-
-proc {system nuggeted} {} {
-	if {![system pkginst nugget]} { return 0 }
-	if {[system nugget ping] eq "PONG"} {
-		return 1
-	}
-	return 0
-}
-
-proc {system nugget} {args} {
-	if {[catch {set ret [exec /mod/bin/nugget {*}$args]} msg]} {
-		return ""
-	}
-	return $ret
-}
-
-proc {system strip} {str} {
-	if {[string range $str 1 2] eq "i7"} {
-		# ISO6937, convert to UTF-8
-		return [xconv [string range $str 3 end]]
-	}
-	if {[string first "\025" $str] == 0} {
-		# UTF-8
-		return [string range $str 1 end]
-	}
-	return [xconv $str]
-}
-
-proc {system usbdisks} {{full 0}} {
-	set disks [lmap i [glob -nocomplain \
-	    -directory /sys/bus/usb/drivers/usb-storage *:*] {
-		file tail $i
-	    }]
-	if {!$full} {
-		return [llength $disks]
-	}
-	if {![llength $disks]} { return {} }
-
-	# Build list of device to device ID
-	set map {}
-	foreach block [glob -nocomplain -directory /sys/block sd?] {
-		set link [file readlink $block/device]
-		foreach disk $disks {
-			if {[string first "/$disk/" $link] >= 0} {
-				set map([file tail $block]) $disk
-			}
-		}
-		
-	}
-	return $map
-}
-
-proc {system usbmounts} {{full 0}} {
-	if {!$full} {
-		set num 0
-		catch {
-			set num [
-			    exec grep -cE {^/dev/sd[a-z][1-9] /media/[^/]+ } \
-				/proc/mounts]
-		}
-		return $num
-	}
-	set ret {}
-	if {[catch {
-		set lines [exec grep -E {^/dev/sd[a-z][1-9] /media/[^/]+ } \
-		    /proc/mounts]
-	}]} { return $ret }
-	foreach line [split $lines "\n"] {
-		lassign $line dev mp
-		set rec "DEV {$dev} MP {$mp} LABEL {NO NAME} TYPE Unknown"
-
-		set rec(VENDOR) Unknown
-		set rec(MODEL) Unknown
-
-		if {[regexp {/dev/(sd[a-z])} $dev x rdev]} {
-			set rec(RDEV) $rdev
-			if {[file readable [
-			    set f /sys/block/$rdev/device/vendor]]} {
-				set rec(VENDOR) [string trim [file read $f]]
-			}
-			if {[file readable [
-			    set f /sys/block/$rdev/device/model]]} {
-				set rec(MODEL) [string trim [file read $f]]
-			}
-		}
-
-		lassign [exec stat -f -c {%S %b %f} $mp] blocks blockc blockf
-		set rec(SIZE) $($blockc * $blocks)
-		set rec(USED) $(100 - $blockf * 100 / $blockc)
-
-		# /dev/sda1: LABEL="SAN" UUID="DBC1-1CF8" TYPE="vfat"
-		catch {
-		  foreach field [
-		    split [exec /mod/sbin/blkid -c /dev/null $dev] "\n"] {
-			while {[regexp { *([A-Z]+)="?([^"]+)"?(.*)} \
-			    $field x k v field]} {
-				set rec($k) $v
-			}
-		  }
-		}
-		# Test for EXFAT
-		if {$rec(TYPE) eq "Unknown" && [
-		    file exists /mod/sbin/exfatlabel]} {
-		      catch {
-			set label [exec /mod/sbin/exfatlabel $dev 2>/dev/null]
-			if {$label ne ""} {
-				set rec(TYPE) "EXFAT"
-				set rec(LABEL) $label
-			}
-		      }
-		}
-
-		lappend ret $rec
-	}
-
-	return $ret
-}
-
-proc {system has} {comp} {
-	switch $comp {
-	    wifi_dongle {
-		if {[catch {exec /mod/bin/iwgetid}]} { return 0 }
-		return 1
-	    }
-	    tvdb {
-		require settings.class
-		return [[settings] _nval_setting tvdb]
-	    }
-	}
-	return 0
-}
-
-# Note that {system checkop} can be called from processes other than that
-# which started the operation. Hence no visilibty into the ::system::ops
-# dictionary.
-proc {system checkop} {op} {
-	if {![regexp -nocase -- {^[.a-z0-9]+$} $op]} { return 0 }
-	if {[catch {set fp [open "/tmp/.bgop.$op" "a"]}]} {
-		return 0
-	}
-	set ret 1
-	if {[$fp lock]} {
-		$fp unlock
-		set ret 0
-	}
-	$fp close
-	return $ret
-}
-
-set ::system::ops {}
-
-proc {system startop} {args op file} {
-	if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 }
-	if {"-multiple" in $args} {
-		set i 0
-		append op "[pid]."
-		while {[dict exists $::system::ops "$op$i"]} { incr i }
-		append op $i
-	} elseif {[dict exists $::system::ops $op]} {
-		system endop $op
-	}
-	if {[catch {
-		set fp [open "/tmp/.bgop.$op" "a"]
-		if {[$fp lock]} {
-			$fp puts "$file\n[pid]"
-			$fp flush
-			set ::system::ops($op) $fp
-		} else {
-			$fp close
-			error "Could not lock op file."
-		}
-	}]} { return 0 }
-	return $op
-}
-
-proc {system endop} {op} {
-	if {![regexp -nocase -- {^[.a-z0-9]+$} $op]} { return 0 }
-	if {[dict exists $::system::ops $op]} {
-		catch {
-			set fp $::system::ops($op)
-			$fp unlock
-			$fp close
-		}
-		dict unset ::system::ops $op
-	}
-	if {[file exists "/tmp/.bgop.$op"]} {
-		file delete "/tmp/.bgop.$op"
-		return 1
-	}
-	return 0
-}
-
-proc {system specialdir} {dir} {
-	if {[string match {\[*} [string trimleft [file tail $dir]]]} {
-		return 1
-	}
-	return 0
-}
-
diff --git a/webif/lib/ts.class.orig b/webif/lib/ts.class.orig
deleted file mode 100644
index 05fd9d86..00000000
--- a/webif/lib/ts.class.orig
+++ /dev/null
@@ -1,899 +0,0 @@
-
-if {![exists -command class]} { package require oo }
-if {![exists -command pack]} { package require pack }
-if {![exists -command xconv]} { package require xconv }
-if {![exists -command binary]} { package require binary }
-
-source /mod/webif/lib/setup
-require system.class tvdb.class classdump
-
-set tsgroup {ts nts hmt thm}
-
-class ts {
-	file		""
-	base		""
-	title		""
-	synopsis	""
-	definition	""
-	channel_num	0
-	channel_name	""
-	start		0
-	end		0
-	flags		""
-	error		""
-	guidance	""
-	bookmarks	0
-	schedstart	0
-	scheddur	0
-	genre		0
-	resume		0
-	status		""
-	series		""
-
-	seriescached	1
-	seriesnum	0
-	episodenum	0
-	episodetot	0
-	episodename	""
-	tvdb_method	""
-	tvdb_series	{}
-	tvdb_data	{}
-}
-
-ts method bfile {} {
-	return [file tail [file rootname $file]]
-}
-
-ts method dir {} {
-	return [file dirname $file]
-}
-
-ts method duration {{raw 0}} {
-	set d [expr $end - $start]
-	if {!$raw} { set d $($d / 60) }
-	return $d
-}
-
-ts method size {} {
-	return [file size $file]
-}
-
-ts method _parse {line} {
-	set vars [split $line "\t"]
-
-	lassign [split $line "\t"] \
-	    title synopsis definition channel_num channel_name \
-	    start end flags_list guidance bookmarks schedstart scheddur \
-	    genre resume status seriesnum episodenum episodetot
-
-	set synopsis [xconv $synopsis]
-
-	set flags [split [string range $flags_list 0 end-1] ,]
-}
-
-ts method lastmod {} {
-	return [file mtime "[file rootname $file].hmt"]
-}
-
-ts method inuse {} {
-	return [system inuse $file]
-}
-
-ts method bookmarks {{aslist 0}} {
-	set marks [split [string trim [exec /mod/bin/hmt -bookmarks $file]]]
-	if {$aslist} { return $marks }
-	return [join $marks " "]
-}
-
-ts method setbookmarks {marks} {
-	exec /mod/bin/hmt +setbookmarks=[join $marks :] $file
-}
-
-ts method storeepisode {{data {}}} {
-	if {[llength $data]} {
-		set d [join $data ","]
-	} else {
-		set d "$seriesnum,$episodenum,$episodetot"
-	}
-	exec /mod/bin/hmt +setseries=$d $file
-}
-
-ts method clearepdata {} {
-	set seriesnum 0
-	set episodenum 0
-	set episodetot 0
-}
-
-ts method flag {f} {
-	if {$f in $flags} {return 1} else {return 0}
-}
-
-ts method unflag {f} {
-	lremove flags $f
-}
-
-ts method unlock {} {
-	set cmd [list /mod/bin/hmt -lock $file]
-	exec {*}$cmd
-	lremove flags "Locked"
-	return 1
-}
-
-ts method lock {} {
-	set cmd [list /mod/bin/hmt +lock $file]
-	exec {*}$cmd
-	ladd flags "Locked"
-	return 1
-}
-
-set ::ts::flagmap {
-	detectads	Addetection
-	dedup		Deduped
-	encrypted	ODEncrypted
-	protect		Encrypted
-}
-
-ts method setflag {flag {dummy 0}} {
-	if {!$dummy} {
-		set cmd [list /mod/bin/hmt +$flag $file]
-		if {[catch {exec {*}$cmd}]} {
-			throw 20 "Unknown flag."
-		}
-	}
-	if {[dict exists $::ts::flagmap $flag]} {
-		ladd flags $::ts::flagmap($flag)
-	} else {
-		ladd flags [string totitle $flag]
-	}
-	return 1
-}
-
-ts method unsetflag {flag {dummy 0}} {
-	if {!$dummy} {
-		set cmd [list /mod/bin/hmt -$flag $file]
-		if {[catch {exec {*}$cmd}]} {
-			throw 20 "Unknown flag."
-		}
-	}
-	if {[dict exists $::ts::flagmap $flag]} {
-		lremove flags $::ts::flagmap($flag)
-	} else {
-		lremove flags [string totitle $flag]
-	}
-	return 1
-}
-
-ts method set_shrunk {} {
-	set cmd [list /mod/bin/hmt +shrunk $file]
-	exec {*}$cmd
-	ladd flags "Shrunk"
-	return 1
-}
-
-ts method set_deduped {} {
-	set cmd [list /mod/bin/hmt +dedup $file]
-	exec {*}$cmd
-	ladd flags "Deduped"
-	return 1
-}
-
-ts method unset_deduped {} {
-	set cmd [list /mod/bin/hmt -dedup $file]
-	exec {*}$cmd
-	lremove flags "Deduped"
-	return 1
-}
-
-ts method unenc {} {
-	set cmd [list /mod/bin/hmt -protect $file]
-	exec {*}$cmd
-	lremove flags "Encrypted"
-	return 1
-}
-
-ts method enc {} {
-	set cmd [list /mod/bin/hmt +protect $file]
-	exec {*}$cmd
-	ladd flags "Encrypted"
-	return 1
-}
-
-ts method set_new {} {
-	set cmd [list /mod/bin/hmt +new $file]
-	exec {*}$cmd
-	ladd flags "New"
-	return 1
-}
-
-ts method set_watched {} {
-	set cmd [list /mod/bin/hmt -new $file]
-	exec {*}$cmd
-	lremove flags "New"
-	return 1
-}
-
-ts method setfile {f} { set file $f }
-
-proc {ts parse} {file line} {
-	set e [ts new]
-	$e setfile $file
-	$e _parse $line
-	return $e
-}
-
-proc {ts exec} {file} {
-	set raw 0
-	set cmd [list /mod/bin/hmt]
-	lappend cmd "-p"
-	lappend cmd $file
-
-	#puts "CMD -$cmd-"
-
-	return [exec {*}$cmd]
-}
-
-ts method fileset {} {
-	global tsgroup
-
-	set root [file rootname $file]
-	set fset {}
-	foreach ext $tsgroup {
-		if {[file exists "$root.$ext"]} {
-			lappend fset "$root.$ext"
-		}
-	}
-	return $fset
-}
-
-proc {ts fetch_or_error} {file {checked 0}}  {
-	if {[catch {set ts [ts fetch $file $checked]}] || $ts == 0} {
-		print "Could not load ts file $file"
-		return 0
-	}
-	return $ts
-}
-
-proc {ts fetch} {file {checked 0}} {
-	# Check that this is a .ts file which has at least one sidecar
-	# file (.hmt)
-	if {!$checked} {
-		if {[file extension $file] ne ".ts"} { return 0 }
-		if {![file exists "[file rootname $file].hmt"]} { return 0 }
-	}
-
-	if {[file extension $file] ne ".ts"} {
-		set file "[file rootname $file].ts"
-	}
-
-	return [ts parse $file [ts exec $file]]
-}
-
-ts method delete {} {
-	foreach f [$self fileset] {
-		file tdelete $f
-		puts "Removed $f<br>"
-	}
-	return 1
-}
-
-ts method move {dst {touch 0} {force 0}} {
-	foreach f [$self fileset] {
-		set nf "$dst/[file tail $f]"
-		while {[file exists $nf]} {
-			set nf "$dst/_[file tail $nf]"
-		}
-		file rename $f $nf
-		if {$touch} {
-			exec /mod/bin/busybox/touch $nf
-		}
-	}
-	return 1
-}
-
-ts method copy {dst} {
-	foreach f [$self fileset] {
-		file copy $f "$dst/[file tail $f]"
-	}
-	return 1
-}
-
-ts method settitle {newtitle} {
-	if {[string length $newtitle] > 48} { return }
-
-	exec /mod/bin/hmt "+settitle=${newtitle}" $file
-	set title $newtitle
-}
-
-ts method setsynopsis {newsynopsis} {
-	if {[string length $newsynopsis] > 252} { return }
-
-	exec /mod/bin/hmt "+setsynopsis=${newsynopsis}" $file
-	set synopsis $newsynopsis
-}
-
-ts method setguidance {newguidance} {
-	if {[string length $newguidance] > 74} { return }
-
-	if {$newguidance eq ""} {
-		exec /mod/bin/hmt "-guidance" $file
-	} else {
-		exec /mod/bin/hmt "+setguidance=${newguidance}" $file
-	}
-	set guidance $newguidance
-}
-
-proc {ts genre} {genre} {
-	if {![string is integer $genre] || $genre < 0} {
-		set genre 0
-	}
-	if {$genre <= 15} {
-		set genre $($genre << 4)
-	}
-	return $genre
-}
-
-ts method setgenre {newgenre} {
-	set newgenre [ts genre $newgenre]
-	exec /mod/bin/hmt "+setgenre=-${newgenre}" $file
-	set genre $newgenre
-}
-
-ts method dlnaloc {{urlbase ""}} {
-	return [system dlnaurl $file $urlbase]
-}
-
-ts method cleanbmp {} {
-	set bfile [file rootname $file]
-	foreach f [glob -nocomplain "${bfile}*.bmp"] {
-		file delete $f
-	}
-}
-
-ts method mkbmps {{offset 0}} {
-	set bfile [file rootname $file]
-	if {[catch {
-	    exec /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
-	    -vf fps=fps=2 -frames 5 \
-	    -pix_fmt argb -vf vflip -s 140x78 "${bfile}%d.bmp"
-	} msg]} {
-		puts "ERROR: $msg"
-		return 0
-	}
-	return 1
-}
-
-ts method mkbmp {{offset 0} {ext ""}} {
-	set bfile [file rootname $file]
-	set bmpfile "$bfile$ext.bmp"
-	set cmd [list /mod/bin/ffmpeg -loglevel fatal -ss $offset -i $file \
-	    -frames 1 -pix_fmt argb -vf vflip -s 140x78 -y $bmpfile]
-	catch { exec {*}$cmd }
-	if {![catch { file stat $bmpfile stbmp }]} {
-		if {[dict get $stbmp size] != 0} { return 1 }
-	}
-	return 0
-}
-
-ts method mkthm {{offset 0}} {
-	if {![$self mkbmp $offset]} { return 0 }
-	set bfile [file rootname $file]
-	# Trim the bitmap header from the start of the file
-	if {[catch {
-	    exec /bin/dd if=$bfile.bmp of=$bfile.thm~ bs=54 skip=1
-	    } msg]} {
-		puts "ERROR: $msg"
-		return 0
-	}
-	exec /bin/echo -n " " >> $bfile.thm~
-	file rename -force $bfile.thm~ $bfile.thm
-	file tdelete $bfile.bmp
-	$self setflag thumbnail
-	return 1
-}
-
-# From MontysEvilTwin
-# - https://hummy.tv/forum/threads/7787/page-2#post-106826
-# ffmpeg -i "File 1.ts" -c:a mp3 -b:a 128k "File 1.mp3"
-# ffmpeg -i "File 1.ts" -c:a copy "File 1.mp2"
-# ffmpeg -i "File 1.ts" -c:a copy "File 1.loas"
-ts method mkmp3 {{slow false} {tmp ""} {v 0} {br 128}} {
-	set rfile [file rootname $file]
-
-	if {$slow} {
-		set opts [list -c:a mp3 -b:a ${br}k]
-		set ext mp3
-	} else {
-		set opts [list -c:a copy]
-		if {$definition eq "HD"} {
-			set ext loas
-		} else {
-			set ext mp2
-		}
-	}
-	set cmd [list /mod/bin/ffmpeg \
-	    -y -benchmark -vn -v $v \
-	    -i $file {*}$opts \
-	]
-
-	if {$tmp eq ""} {
-		lappend cmd "${rfile}.$ext"
-	} else {
-		lappend cmd "$tmp.$ext"
-	}
-
-	set output [exec {*}$cmd]
-
-	if {$tmp ne ""} {
-		file rename "$tmp.$ext" "${rfile}.mp3"
-	} elseif {$ext ne "mp3"} {
-		file rename "${rfile}.$ext" "${rfile}.mp3"
-	}
-
-	exec /mod/bin/id3v2 \
-	    --song $title \
-	    --comment $synopsis \
-	    --album $channel_name \
-	    --year "[clock format $start -format {%Y}]" \
-	    "${rfile}.mp3"
-
-	return $output
-}
-
-ts method mkmpg {{tmp ""}} {
-	set rfile [file rootname $file]
-
-	set cmd [list /mod/bin/ffmpeg \
-	    -y -benchmark -v 0 \
-	    -i $file \
-	    -map 0:0 -map 0:1 \
-	    -vcodec copy -acodec copy]
-
-	if {$tmp eq ""} {
-		lappend cmd "${rfile}.mpg"
-	} else {
-		lappend cmd "$tmp.mpg"
-	}
-
-	set output [exec {*}$cmd]
-
-	if {$tmp ne ""} {
-		file rename "$tmp.mpg" "${rfile}.mpg"
-	}
-
-	return $output
-}
-
-proc {ts renamegroup} {from to} {
-	global tsgroup
-
-	set dir [file dirname $from]
-	set root [file rootname $from]
-
-	# Catch from string without a . character in it
-	if {$root eq $from} { return }
-
-	foreach ext $tsgroup {
-		set f "$root.$ext"
-		if {![file exists $f]} continue
-		file rename $f "${dir}/${to}.${ext}"
-	}
-
-	exec /mod/bin/hmt "+setfilename=$to" "${dir}/${to}.hmt"
-
-#	set ndir [file normalize $dir]
-#
-#	if {![catch {set db [sqlite3.open $::dmsfile]}]} {
-#	    catch {
-#		set x [lindex [$db query {select mediaid from tblMedia
-#		    where localUrl = '%s'} [file normalize $from]] 0]
-#		lassign $x key mediaid
-#		if {$mediaid ne ""} {
-#			$db query {update tblMedia set localUrl = '%s'
-#			    where mediaid = %s} "${ndir}/{$to}.ts" $mediaid
-#			$db query {update tblMedia set title = '%s'
-#			    where mediaid = %s} "{$to}.ts" $mediaid
-#		}
-#	    }
-#	$db close
-#	}
-}
-
-proc {ts touchgroup} {target ref} {
-	global tsgroup
-
-	set dir [file dirname $target]
-	set root [file rootname $target]
-
-	# Catch from string without a . character in it
-	if {$root eq $target} { return }
-
-	foreach ext $tsgroup {
-		set f "$root.$ext"
-		if {![file exists $f]} continue
-		file touch $f $ref
-	}
-}
-
-proc {ts resetnew} {dir} {
-	if {![file isdirectory $dir]} return
-	if {![file exists "$dir/.series"]} {
-		set fd [open "$dir/.series" "w"]
-		puts -nonewline $fd [string repeat "\x0" 276]
-		close $fd
-	}
-
-	set tot 0
-	set watched 0
-	foreach file [readdir -nocomplain $dir] {
-		if {![string match {*.ts} $file]} { continue }
-		incr tot
-		if {[set ts [ts fetch "$dir/$file"]] != 0} {
-			if {![$ts flag "New"]} { incr watched }
-		}
-	}
-
-	if {!$tot} {
-		file delete "$dir/.series"
-		return
-	}
-
-	set fd [open "$dir/.series"]
-	set bytes [read $fd]
-	close $fd
-	set recs [unpack $bytes -uintle 0 32]
-	set played [unpack $bytes -uintle 32 32]
-
-	#puts "Current: $played/$recs"
-	#hexdump $bytes
-	#puts "Calculated: $watched/$tot"
-
-	pack bytes $tot -intle 32 0
-	pack bytes $watched -intle 32 32
-
-	#hexdump $bytes
-
-	set fd [open "$dir/.series" "w"]
-	puts -nonewline $fd $bytes
-	close $fd
-}
-
-proc {ts iterate} {callback {verbose 0} {dir ""} {nospecial 0}} {{rootdev 0}} {
-	require system.class
-	if {$dir eq ""} {
-		set dir [system mediaroot]
-		file stat "$dir/" rootstat
-		set rootdev $rootstat(dev)
-	}
-
-	if {$verbose} { puts "Scanning directory ($dir)" }
-
-	if {$rootdev != 0} {
-		file stat "$dir/" st
-		if {$st(dev) != $rootdev} return
-	}
-
-	if {$nospecial && [system specialdir $dir]} return
-
-	foreach entry [readdir -nocomplain $dir] {
-		if {[file isdirectory "$dir/$entry"]} {
-			ts iterate $callback $verbose "$dir/$entry" $nospecial
-			continue
-		}
-		if {![string match {*.ts} $entry]} continue
-		if {[catch {set ts [ts fetch "$dir/$entry"]}]} continue
-		if {$ts == 0} continue
-                $callback $ts
-	}
-}
-
-#
-# Attempt to extract the series/episode names using a variety of techniques
-#
-
-ts method series_name {} {
-
-	# For recorded series, use the folder name
-	set dir [file dirname $file]
-	if {[file exists "$dir/.series"]} {
-		set s [file tail $dir]
-	} else {
-		set s $title
-	}
-
-	foreach x {
-		{^new: *}
-	} {
-		regsub -nocase -all -- $x $s "" s
-	}
-
-	return $s
-}
-
-set ::ts::episode_prefixes {
-	{^new series\.* *}
-	{^cbeebies\.* *}
-	{^cbbc\.* *}
-	{^t4: *}
-	{^brand new series *[-:]* *}
-	{^\.+}
-	{ *\(Part [0-9] of [0-9]\) *}
-	{, Part [0-9]}
-}
-
-ts method _tvdb_resolve {seriesid} {
-	# See if we can find a TVDB series for this recording.
-
-	set dir [file dirname $file]
-
-	set tvdb_series [set v [tvdb series "" $seriesid]]
-	if {[$v get seriesid] == 0} { return }
-
-	# Got one.
-
-	# Easiest case - we can explicitly request the episode.
-	if {$seriesnum && $episodenum} {
-		if {$seriescached} {
-			set tvdb_method "cached values"
-		} else {
-			set tvdb_method "series and episode number"
-		}
-		return [$v episodebynum $seriesnum $episodenum]
-	}
-
-	# Now try to find the episode using the current episode name
-	# (using series or episode number if available)
-	set k [$v episodebyname $episodename $seriesnum $episodenum]
-	if {[llength $k]} {
-		set tvdb_method "episode name ($episodename)"
-		return $k
-	}
-
-	# More problematic but can at least narrow the list of candidates
-	# using the episode or series numbers if we have them.
-
-	if {$episodenum} {
-		set tvdb_method "episode number"
-		return [$v episodebyepnum $episodenum $synopsis]
-	}
-
-	if {$seriesnum} {
-		set tvdb_method "series and synopsis"
-		return [$v episodebyseries $seriesnum $synopsis]
-	}
-
-	# Most difficult - try and match based on synopsis alone
-	set tvdb_method "synopsis text"
-	return [$v episodebysynopsis $synopsis]
-}
-
-proc {ts serieslist} {dir} {
-	set idfile "$dir/.tvdbseriesid"
-	if {![file exists $idfile]} { return {} }
-	return [lmap i [split [file read $idfile] "\n"] {
-		string trim $i
-	}]
-}
-
-ts method extract_numbers {} {
-
-	######################################################################
-	# Check for embedded Series/Episode number.
-	# Thank you broadcasters for the variation!
-	# Least trustworthy first.
-
-	# Episode 5
-	regexp -nocase -- {Episode (\d+)} $synopsis x episodenum
-
-	# ^23/27.
-	regexp -nocase -- {^\s*(\d+)/(\d+)} $synopsis x episodenum episodetot
-
-	# (8/8)
-	regexp -nocase -- {\((\d+)/(\d+)\)} $synopsis x episodenum episodetot
-
-	# (Episode 5/10)
-	# (Ep5/10)
-	# (Ep 3 of 3)
-	# (Ep3)
-	regexp -nocase -- {Epi?s?o?d?e?\s*(\d+)\s*(of|/)?\s*(\d+)?} $synopsis \
-	    x episodenum x episodetot
-
-	# (S2 Ep1)
-	# S.02 Ep.002
-	# S01 Ep52
-	# (S4 Ep 7)
-	# (S1, ep 2)
-	# (S8, Ep2)
-	# (S4 Ep22/24)
-	regexp -nocase -- {S\.*(\d+),?\s*Ep\.?\s*(\d+)(/(\d+))?} $synopsis \
-	    x seriesnum episodenum x episodetot
-
-    # (Part 5/10)
-	# (Pt. 5/10)
-	# (Part 5 of 10)
-	# (Pt. 5 of 10)
-	# (Pt5)
-	regexp -nocase -- {P(art|t\.?)\s*(\d+)\s*(of|/)?\s*(\d+)?} $synopsis \
-		x x episodenum x episodetot
-
-	foreach v {seriesnum episodenum episodetot} {
-		if {[set $v] eq ""} {
-			set $v 0
-		} else {
-			incr $v 0
-		}
-	}
-
-}
-
-ts method episode_name {} {
-	set s $synopsis
-
-	######################################################################
-	# Attempt to determine the episode name from the synopsis
-
-	# Strip common prefixes
-	foreach prefix $::ts::episode_prefixes {
-		regsub -nocase -all -- $prefix $s "" s
-	}
-
-	# Strip anything following a colon.
-	regsub -all -- { *[:].*$} $s "" s
-
-	# If the resulting string is longer than 40 characters then
-	# split around . and take the left hand side if appropriate.
-	if {[string length $s] > 40} {
-		lassign [split $s "."] v w
-		set s $v
-		if {[string length $s] < 6 && [string length $w] < 6} {
-			append s "_$w"
-		}
-	}
-
-	# Shorten if too long.
-	if {[string length $s] > 40} { set s [string range $s 0 39] }
-
-	set episodename $s
-
-	if {$episodenum == 0} {
-		$self extract_numbers
-		set seriescached 0
-	}
-
-	# Now see if TVDB has anything to add
-
-	set fbase "[file dirname $file]/.tvdb"
-
-	if {![system has tvdb] || ![file exists "${fbase}seriesid"]} {
-		return $s
-	}
-
-	if {!$seriesnum && [file exists "${fbase}series"]} {
-		set seriesnum [string trim [file read "${fbase}series"]]
-	}
-	foreach seriesid [ts serieslist [$self dir]] {
-		set tvdb_data [$self _tvdb_resolve $seriesid]
-		if {![dict exists $tvdb_data name]} continue
-		set flag 0
-		if {!$seriesnum} {
-			set seriesnum $tvdb_data(series)
-			incr flag
-		}
-		if {!$episodenum} {
-			set episodenum $tvdb_data(episode)
-			incr flag
-		}
-		if {$flag} { $self storeepisode }
-
-		return $tvdb_data(name)
-	}
-
-	return $s
-}
-
-ts method epstr {{format "s%se%E/%n"}} {
-	set map {}
-	if {$seriesnum eq 0} {
-		set map(%s) "?"
-		set map(%S) "??"
-	} else {
-		set map(%s) $seriesnum
-		set map(%S) [format "%02d" $seriesnum]
-	}
-	if {$episodenum eq 0} {
-		set map(%e) "?"
-		set map(%E) "??"
-	} else {
-		set map(%e) $episodenum
-		set map(%E) [format "%02d" $episodenum]
-	}
-	if {$episodetot eq 0} {
-		set map(%n) "?"
-		set map(%N) "??"
-	} else {
-		set map(%n) $episodetot
-		set map(%N) [format "%02d" $episodetot]
-	}
-	return [string map $map $format]
-}
-
-ts method tsr {} {
-	set fd [open "[file rootname $file].nts"]
-	set bytes [read $fd 0x20]
-	close $fd
-	set tsr [unpack $bytes -uintle $(8 * 0x1f) 8]
-	return $tsr
-}
-
-ts method genrenib {} {
-	if {[catch {set v $($genre >> 4)}]} { set v 0 }
-	return $v
-}
-
-ts method genre_info {} {
-	set g [$self genrenib]
-	lassign $::epg::genrelist($g) txt img
-	if {$img eq "Unclassified"} {
-		set img "/images/173_3_26_G3_$img.png"
-	} else {
-		set img "/images/173_3_00_G3_$img.png"
-	}
-	return [list $txt $img]
-}
-
-proc {ts genrelist} {} {
-	require epg.class
-	set glist {}
-	foreach {k v} $::epg::genrelist {
-		lappend glist $($k << 4) $v
-	}
-	return $glist
-}
-
-# return the key that will decrypt the file in the mode, or nothing
-ts method getkey {mode} {
-	# mode: dlna (active key), direct
-
-	set rfile [file rootname $file]
-
-	set keys {}
-	# the active key
-	set key [string range [system nugget cryptokey -key] 0 31]
-	if {$key ne ""} {
-		lappend keys $key
-	}
-	if { $mode ne "dlna" } {
-		# also try other keys, such as this - same as active?
-		set key [system customencryptionkey]
-		if {$key ne ""} {
-			ladd keys $key
-		}
-
-		# the native key
-		if {![catch {set key [system encryptionkey]}]} {
-			ladd keys $key
-		}
-
-		# support a file listing other keys in hex, one-per-line
-		# eg, for recordings imported from a broken box
-		try {
-			set fd [open "/mod/etc/keys" r]
-			foreach key [split [$fd read -nonewline] "\n"] {
-				ladd keys $key
-			}
-		} on error {} {
-		} finally {
-			catch {$fd close}
-		}
-	}
-
-	foreach key $keys {
-		if {[catch {
-			set ret [exec /mod/bin/stripts -q/ $key $rfile]
-		}]} continue
-		if {$ret eq "1"} {
-			return $key
-		}
-	}
-	return
-}
-

From 5edd63b2afebb913927849baa4811c5f4e44d859 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:43:51 +0000
Subject: [PATCH 90/91] Fix for "system dlnaurl" reversion

---
 webif/html/browse/play.jim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webif/html/browse/play.jim b/webif/html/browse/play.jim
index 3eb8dc37..1f4b4a97 100755
--- a/webif/html/browse/play.jim
+++ b/webif/html/browse/play.jim
@@ -15,7 +15,7 @@ set vc [cgi_get vc ""]
 set url $file
 
 # Prefer to use DLNA server ... (necessary if encrypted)
-set dlna [system dlnaurl $url $urlbase]
+set dlna [system dlnaurl [file normalize $url] $urlbase]
 if {[llength $dlna]} { 
 	set url [lindex $dlna 0]
 } elseif {[regexp {^(https?://(.+:.*@)?[[:alnum:].]+(:[[:digit:]]+)?)/} $urlbase x y]} {

From a79addc54311ed1aa857db2c1a2dc17d8be4f110 Mon Sep 17 00:00:00 2001
From: prpr <prpr19xx@gmail.com>
Date: Fri, 25 Mar 2022 23:46:52 +0000
Subject: [PATCH 91/91] Remove redundant rename/comments

---
 webif/html/browse/crop/execute.jim | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webif/html/browse/crop/execute.jim b/webif/html/browse/crop/execute.jim
index bca7d78d..d32cb307 100755
--- a/webif/html/browse/crop/execute.jim
+++ b/webif/html/browse/crop/execute.jim
@@ -70,10 +70,6 @@ set newname "$shname-[clock seconds]"
 puts "Renaming file group to $newname"
 puts "<span class=hidden id=fileparams file=\"$dir/$newname.ts\"></span>"
 ts renamegroup "$dir/$shname.ts" $newname
-exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
-# New nicesplice shrinks whilst cropping.
-# No longer required - nicesplice now sets this flag.
-#exec /mod/bin/hmt "+shrunk" "$dir/$newname.hmt"
 
 set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
 puts "Time taken: $croptime"