df/webif
1
0
Fork 0
forked from hummypkg/webif
Code Issues Pull Requests Releases Wiki Activity

-11

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3449 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg
2016-12-30 11:55:29 +00:00
parent fadca6e8c5
commit 09dd487b60
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.3.4-10 Version: 1.3.4-11
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hpkg.tv 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) 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)

16
webif/lib/bin/auto
View File

@@ -269,6 +269,22 @@ if {[system dlnastatus]} {
} else { } else {
set dlnaok 0 set dlnaok 0
log "DLNA Server is NOT running." 2 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" log "Auto processing starting, DLNA server status: $dlnaok"

13
webif/lib/queue.class
View File

@@ -46,11 +46,6 @@ proc {queue dbhandle} {args} {
} }
} else { } else {
set ::queue::db [sqlite3.open /mod/etc/queue.db] 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 return $::queue::db
@@ -82,6 +77,14 @@ proc {queue startup} {{days 7}} {
log = 'Job will be retried automatically.', log = 'Job will be retried automatically.',
retry = retry + 1 retry = retry + 1
where status in ('RUNNING', 'INTERRUPTED') 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 { $db query {
delete from queue delete from queue

6
webif/lib/settings.class
View File

@@ -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 global settingsdb
if {$val eq "-1"} { if {$val eq "-1"} {
@@ -134,7 +134,7 @@ settings method _tval_setting {name {val -1}} {
if {$res ne ""} { if {$res ne ""} {
return [lindex [lindex $res end] end] return [lindex [lindex $res end] end]
} }
return 0 return $def
} else { } else {
# Set # Set
$settingsdb query " $settingsdb query "
@@ -258,7 +258,7 @@ settings method autolast {{val -1}} {
} }
settings method noautohours {{val -1}} { settings method noautohours {{val -1}} {
set val [$self _tval_setting noautohours $val] set val [$self _tval_setting noautohours $val ""]
return $val return $val
} }