From 09dd487b60f26f0a432cbebb91e3d8358da3a5e3 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Fri, 30 Dec 2016 11:55:29 +0000
Subject: [PATCH] -11

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3449 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control          |  2 +-
 webif/lib/bin/auto       | 16 ++++++++++++++++
 webif/lib/queue.class    | 13 ++++++++-----
 webif/lib/settings.class |  6 +++---
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index fd43cc2..c022dde 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.3.4-10
+Version: 1.3.4-11
 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.08),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)
diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto
index 45a2b86..1416d5c 100755
--- a/webif/lib/bin/auto
+++ b/webif/lib/bin/auto
@@ -269,6 +269,22 @@ if {[system dlnastatus]} {
 } else {
 	set dlnaok 0
 	log "DLNA Server is NOT running." 2
+	if {[system instandby]} {
+		log "System is in standby." 2
+	} elseif {[system param DMS_START_ON] ne "1"} {
+		log "DLNA is disabled." 2
+	} else {
+		log "Giving DLNA more time to start..." 2
+		loop x 0 10 {
+			sleep 10
+			if {[system dlnastatus]} {
+				set dlnaok 1
+				log "DLNA Server is running." 2
+				break
+			}
+			log "DLNA Server not yet running, waiting..." 2
+		}
+	}
 }
 
 log "Auto processing starting, DLNA server status: $dlnaok"
diff --git a/webif/lib/queue.class b/webif/lib/queue.class
index c9d16d6..6381ba1 100644
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -46,11 +46,6 @@ proc {queue dbhandle} {args} {
 		}
 	} else {
 		set ::queue::db [sqlite3.open /mod/etc/queue.db]
-# XXX - Remove before release
-		catch { $::queue::db query {
-			alter table queue
-			add column elapsed integer default 0
-		}}
 	}
 
 	return $::queue::db
@@ -82,6 +77,14 @@ proc {queue startup} {{days 7}} {
 		log = 'Job will be retried automatically.',
 		retry = retry + 1
 		where status in ('RUNNING', 'INTERRUPTED')
+		and retry < 5
+	}
+	$db query {
+		update queue
+		set status = 'FAILED',
+		log = 'Too many retries.',
+		retry = retry + 1
+		where status in ('RUNNING', 'INTERRUPTED')
 	}
 	$db query {
 		delete from queue
diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index 26908f7..bad7d82 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -122,7 +122,7 @@ settings method _nval_setting {name {val -1}} {
 	}
 }
 
-settings method _tval_setting {name {val -1}} {
+settings method _tval_setting {name {val -1} {def 0}} {
 	global settingsdb
 
 	if {$val eq "-1"} {
@@ -134,7 +134,7 @@ settings method _tval_setting {name {val -1}} {
 		if {$res ne ""} {
 			return [lindex [lindex $res end] end]
 		}
-		return 0
+		return $def
 	} else {
 		# Set
 		$settingsdb query "
@@ -258,7 +258,7 @@ settings method autolast {{val -1}} {
 }
 
 settings method noautohours {{val -1}} {
-	set val [$self _tval_setting noautohours $val]
+	set val [$self _tval_setting noautohours $val ""]
 	return $val
 }