From caeabd15d08f68ebf7c7d38f6a3faee582e1edc3 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Mon, 9 Jan 2017 19:23:13 +0000
Subject: [PATCH] 1.3.5-2

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3507 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                          |  4 ++--
 webif/html/browse/index.jim              |  7 +++++--
 webif/html/browse/queue.jim              | 11 ++++++++++-
 webif/html/diag/queue/fetch.jim          | 13 +++++++++++--
 webif/html/diag/queue/index.jim          |  2 ++
 webif/html/diag/queue/script.js          |  5 +++++
 webif/lib/auto/deq                       |  2 +-
 webif/lib/auto/plugin/decrypt/auto.hook  |  9 +++++----
 webif/lib/auto/plugin/decrypt/queue.hook | 20 ++++++++++++--------
 webif/lib/auto/plugin/mp3/auto.hook      |  5 +++++
 webif/lib/auto/plugin/mp3/queue.hook     |  8 ++++++--
 webif/lib/auto/plugin/mpg/auto.hook      |  5 +++++
 webif/lib/auto/plugin/shrink/auto.hook   |  5 +++++
 webif/lib/queue.class                    |  2 +-
 webif/lib/ts.class                       |  8 ++++++++
 15 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 80575e4..186f045 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.3.5-1
+Version: 1.3.5-2
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
-Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.5),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.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95),sqlite3(>=3.15.1)
+Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.5),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.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21-1),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95),sqlite3(>=3.15.1)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/7619/
diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim
index 6b1a712..4bf8704 100755
--- a/webif/html/browse/index.jim
+++ b/webif/html/browse/index.jim
@@ -409,7 +409,8 @@ if {$nicesplice} {
 # Queue
 set queueactions(decrypt) "Decryption"
 set queueactions(shrink) "Shrink"
-set queueactions(mp3) "Audio-Extraction"
+set queueactions(mp2) "Audio-Extraction (mp2, fast)"
+set queueactions(mp3) "Audio-Extraction (mp3, slow)"
 set queueactions(mpg) "Conversion to MPG"
 eval_plugins queueactions
 
@@ -419,7 +420,9 @@ Queue for</button>
 <select id=so_queueactions
     class="tsonesel text ui-widget-content ui-corner-all">
 }
-foreach {k v} $queueactions {
+set rqueueactions [lreverse $queueactions]
+foreach v [lsort [dict keys $rqueueactions]] {
+	set k $rqueueactions($v)
 	puts "<option value=$k>$v</option>"
 }
 puts {
diff --git a/webif/html/browse/queue.jim b/webif/html/browse/queue.jim
index fed764a..9ddbe19 100755
--- a/webif/html/browse/queue.jim
+++ b/webif/html/browse/queue.jim
@@ -27,7 +27,16 @@ foreach file [cgi_get files] {
 	set ts [ts fetch $file]
 	if {$ts eq "0"} continue
 
-	queue insert $ts $act
+	if {$act eq "mp2"} {
+		set q [queue insert $ts mp3]
+	} else {
+		set q [queue insert $ts $act]
+	}
+
+	switch -- $act {
+		mp2 { $q set args "-mp2" }
+		mp3 { $q set args "-mp3" }
+	}
 	puts "</li>"
 }
 puts "</ul>"
diff --git a/webif/html/diag/queue/fetch.jim b/webif/html/diag/queue/fetch.jim
index 6785228..b60a7ef 100755
--- a/webif/html/diag/queue/fetch.jim
+++ b/webif/html/diag/queue/fetch.jim
@@ -1,11 +1,19 @@
 #!/mod/bin/jimsh
 
 source /mod/webif/lib/setup
-require queue.class json
+require queue.class json settings.class
 
 httpheader "application/json"
 
-puts "\["
+set s [settings]
+set autolast [$s autolast]
+set autofreq [$s autofreq]
+puts "{"
+puts "  \"autofreq\": \"$autofreq\","
+puts "  \"autolast\": \"[clock format $autolast] ([clock format [expr \
+    [clock seconds] - $autolast] -format %T] ago)\","
+
+puts "  \"data\": \["
 set flag 0
 foreach q [queue all] {
 	set name [string map {
@@ -41,4 +49,5 @@ foreach q [queue all] {
 	puts -nonewline "}"
 }
 puts "\n]"
+puts "}"
 
diff --git a/webif/html/diag/queue/index.jim b/webif/html/diag/queue/index.jim
index 03142f1..9f33ec6 100755
--- a/webif/html/diag/queue/index.jim
+++ b/webif/html/diag/queue/index.jim
@@ -50,6 +50,8 @@ There are no tasks in the queue.
 <button id=refresh>Refresh</button>
 <span id=isloading><img src=/img/loading.gif></span>
 </div>
+<div class=blood>Last scan: <span id=autolast>retrieving...</span> -
+scanning every <span id=autofreq>TBC</span> minutes.</div>
 </fieldset>
 }
 
diff --git a/webif/html/diag/queue/script.js b/webif/html/diag/queue/script.js
index 9c63ae9..7ebb8e6 100644
--- a/webif/html/diag/queue/script.js
+++ b/webif/html/diag/queue/script.js
@@ -14,6 +14,11 @@ function load()
 	$.getJSON('fetch.jim', function(data) {
 		$('#queuetab > tbody').empty();
 
+		$('#autolast').html(data.autolast);
+		$('#autofreq').html(data.autofreq);
+
+		data = data.data;
+
 		$.each(data, function(k, v) {
 
 	s = '<tr>' +
diff --git a/webif/lib/auto/deq b/webif/lib/auto/deq
index 5b869a4..6c94630 100755
--- a/webif/lib/auto/deq
+++ b/webif/lib/auto/deq
@@ -188,7 +188,7 @@ for {set qq [::auto::pending]} {[llength $qq]} {set qq [::auto::pending]} {
 		$q update "FAILED" "Plugin failure" 1
 	    }
 	    "OK" {
-		$q update "COMPLETE" "[::auto::date] $msg" 1 $elapsed
+		$q update "COMPLETE" "$msg ([::auto::date])" 1 $elapsed
 		::auto::runplugins dequeued $plugin $q $ts
 	    }
 	    "DEFER" {
diff --git a/webif/lib/auto/plugin/decrypt/auto.hook b/webif/lib/auto/plugin/decrypt/auto.hook
index 480198c..6e0eff9 100755
--- a/webif/lib/auto/plugin/decrypt/auto.hook
+++ b/webif/lib/auto/plugin/decrypt/auto.hook
@@ -7,15 +7,16 @@ proc ::decrypt::ts {ts} {
 		return
 	}
 
-	if {[$ts flag "Encrypted"]} {
-		::auto::log "  $file - Protected (Enc flag)." 2
-		return
-	}
 	if {[queue check $ts decrypt]} {
 		::auto::log "  $file - Already queued." 2
 		return
 	}
 
+	if {[::auto::inuse $ts]} {
+		::auto::log "  $file - In use." 2
+		return
+	}
+
 	# Check that the file is not already decrypted by analysing it.
 	set anencd [exec /mod/bin/stripts -qE [file rootname $file]]
 	if {$anencd != "1"} {
diff --git a/webif/lib/auto/plugin/decrypt/queue.hook b/webif/lib/auto/plugin/decrypt/queue.hook
index 02748c0..be072c7 100644
--- a/webif/lib/auto/plugin/decrypt/queue.hook
+++ b/webif/lib/auto/plugin/decrypt/queue.hook
@@ -11,25 +11,25 @@ proc ::decrypt::dequeue {q ts} {
 		return {"OK" "Already decrypted"}
 	}
 
-	if {[$ts flag "Encrypted"]} {
-		return {"DEFER" "Protected (Enc flag)"}
-	}
-
 	if {![system dlnastatus]} {
 		if {[system instandby]} {
 			# Prevent polling every minute
-			return [list "DEFER" "Cannot decrypt in standby" +300]
+			return [list "DEFER" "Cannot decrypt in standby" +120]
 		}
 		return {"DEFER" "DLNA Server not running"}
 	}
 
 	if {[::auto::inuse $ts]} {
 		if {[clock seconds] < [$ts get end]} {
-			if {[$ts get scheddur] == 5700} {
-				# Likely to be instant-recording.
+			if {[$ts tsr]} {
 				return [list "DEFER" \
-				    "Instant-recording in-progress" +300]
+				    "Time-shifted recording in-progress" +120]
 			}
+#			if {[$ts get scheddur] == 5700} {
+#				# Likely to be instant-recording.
+#				return [list "DEFER" \
+#				    "Instant-recording in-progress" +120]
+#			}
 			# Recording in progress, defer until near expected
 			# end.
 			set left $([$ts get end] - [clock seconds])
@@ -51,6 +51,10 @@ proc ::decrypt::dequeue {q ts} {
 		    "Already decrypted but the HMT flag was wrong (fixed)"}
 	}
 
+	if {[$ts flag "Encrypted"]} {
+		return {"DEFER" "Protected (Enc flag)"}
+	}
+
 	lassign [$ts dlnaloc "127.0.0.1"] url
 	if {$url ne ""} {
 		log "  $file - has been indexed."
diff --git a/webif/lib/auto/plugin/mp3/auto.hook b/webif/lib/auto/plugin/mp3/auto.hook
index 8a0e045..b7b5118 100755
--- a/webif/lib/auto/plugin/mp3/auto.hook
+++ b/webif/lib/auto/plugin/mp3/auto.hook
@@ -18,6 +18,11 @@ proc ::mp3::ts {ts} {
 		return
 	}
 
+	if {[::auto::inuse $ts]} {
+		::auto::log "  $file - In use." 2
+		return
+	}
+
 	# Enqueue file
 	set q [queue insert $ts mp3]
 	#$q set args "-mp2"
diff --git a/webif/lib/auto/plugin/mp3/queue.hook b/webif/lib/auto/plugin/mp3/queue.hook
index 40f013c..4cd8d47 100644
--- a/webif/lib/auto/plugin/mp3/queue.hook
+++ b/webif/lib/auto/plugin/mp3/queue.hook
@@ -29,16 +29,20 @@ proc ::mp3::dequeue {q ts} {
 	system startop mp3 [$ts get file]
 	::auto::dsc [$ts size]
 
+	set mp3mode $audiomp3
+	if {"-mp2" in [$q get args]} { set mp3mode 0 }
+	if {"-mp3" in [$q get args]} { set mp3mode 1 }
+
 	::auto::startclock
 
 	log "     MP3: $file" 0
 	log "          Converting... [$::auto::settings \
-	    audiomp3descr $audiomp3]" 0
+	    audiomp3descr $mp3mode]" 0
 	if {[catch {
 		set cmd [list nice -n 19 \
 		    /mod/bin/ffmpeg -y -benchmark -v 0 -i "$file.ts" \
 		    -f mp3 -vn]
-		if {!$audiomp3} { lappend cmd -acodec copy }
+		if {!$mp3mode} { lappend cmd -acodec copy }
 		lappend cmd "$tmp/mp3.mp3"
 		foreach line [split [exec {*}$cmd] "\n"] {
 			log [string trim $line] 0
diff --git a/webif/lib/auto/plugin/mpg/auto.hook b/webif/lib/auto/plugin/mpg/auto.hook
index da5930a..f33e51b 100755
--- a/webif/lib/auto/plugin/mpg/auto.hook
+++ b/webif/lib/auto/plugin/mpg/auto.hook
@@ -18,6 +18,11 @@ proc ::mpg::ts {ts} {
 		return
 	}
 
+	if {[::auto::inuse $ts]} {
+		::auto::log "  $file - In use." 2
+		return
+	}
+
 	# Enqueue file
 	queue insert $ts mpg
 	::auto::log "  $file - Queued for mpg." 0
diff --git a/webif/lib/auto/plugin/shrink/auto.hook b/webif/lib/auto/plugin/shrink/auto.hook
index 3ea79a9..072a8bc 100755
--- a/webif/lib/auto/plugin/shrink/auto.hook
+++ b/webif/lib/auto/plugin/shrink/auto.hook
@@ -12,6 +12,11 @@ proc ::shrink::ts {ts} {
 		return
 	}
 
+	if {[::auto::inuse $ts]} {
+		::auto::log "  $file - In use." 2
+		return
+	}
+
 	if {[catch {
 		set perc [exec /mod/bin/stripts -aq [file rootname $file]]
 	    } msg]} {
diff --git a/webif/lib/queue.class b/webif/lib/queue.class
index 8bc532c..47e76bf 100644
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -175,7 +175,7 @@ proc {queue hold} {id} {
 		update queue
 		set status = 'HOLD'
 		where id = '%s'
-		and status != 'RUNNING'
+		and status not in ('RUNNING', 'COMPLETE')
 	"
 
 	$db query $q $id
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 5e8a0ab..f8e79a1 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -722,3 +722,11 @@ ts method epstr {{format "s%se%E/%n"}} {
 	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
+}
+