From e19cf1998e22a51a45af3117406cdf0781e2a2a4 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Wed, 7 Sep 2016 22:25:23 +0000 Subject: [PATCH] tweaks git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3260 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- webif/html/diag/diag.jim | 1 + webif/html/diag/mux.jim | 4 +--- webif/lib/rsv.class | 4 +++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index cbc6129..3d933c1 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.2-5 +Version: 1.3.2-6 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),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.8),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) +Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),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) Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/7116/ diff --git a/webif/html/diag/diag.jim b/webif/html/diag/diag.jim index 3c6fb14..7f9f508 100755 --- a/webif/html/diag/diag.jim +++ b/webif/html/diag/diag.jim @@ -9,6 +9,7 @@ jscss script.js style.css header pkg loaddiagmeta +eval_plugins diagmeta set model [system model] set smv [system modversion 1] diff --git a/webif/html/diag/mux.jim b/webif/html/diag/mux.jim index eb5d91d..d313576 100755 --- a/webif/html/diag/mux.jim +++ b/webif/html/diag/mux.jim @@ -89,9 +89,7 @@ foreach tw [$db query { "4Music" - "Yesterday" { set mux "COM6/ARQ B" } "BBC NEWS HD" { set mux "COM7/ARQ C" } - "Made In *" - - "Movies4Men" { set mux "Local" } - "CBeebies HD" - + "5STAR+1" - "QVC + 1 HD" { set mux "COM8/ARQ D" } } } diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index 1e01dbb..d3e9b32 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -451,6 +451,8 @@ rsv method insert {{table pending} {force 0} {defer 0}} { $rsvdb query "delete from ${table} where ulslot = $ulslot;" $rsvdb query $query {*}$bvals + system plog activity "Scheduled [$self name] @ $nsttime" + if {$table eq "pending" && !$defer} { rsv commit } } @@ -620,7 +622,7 @@ proc {rsv rtsched} {} { proc {rsv commit} {} { if {![rsv rtsched]} return if {[catch { - exec /mod/boot/rsvsync -realtime >> /tmp/rsvsync.log} msg]} { + exec /mod/boot/rsvsync -realtime >> /mod/tmp/rsvsync.log} msg]} { puts "Scheduling: $msg" } else { system restartpending 0