From 2bb88ac84d8a0b0ce3e7975b6fe9fa9c3ceacc0c Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 30 Jan 2017 21:12:32 +0000 Subject: [PATCH] use .hmt as key file when loading .ts git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3670 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/browse/index.jim | 2 +- webif/html/diag/queue/style.css | 2 +- webif/include/helplinks.jim | 2 ++ webif/lib/ts.class | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 2e5023a..07d7361 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.4.0-1 +Version: 1.4.0-2 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.25),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.10),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21-2),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/html/browse/index.jim b/webif/html/browse/index.jim index 36667a7..3acb741 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -122,7 +122,7 @@ proc entry {file} {{i 0}} { set base [file rootname $file] set thmok 0 - if {$ext eq ".ts" && [file exists "${base}.nts"]} { + if {$ext eq ".ts" && [file exists "${base}.hmt"]} { set type ts set ts [ts fetch $file 1] set rstat [$ts get status] diff --git a/webif/html/diag/queue/style.css b/webif/html/diag/queue/style.css index 37c4fe7..50be30a 100644 --- a/webif/html/diag/queue/style.css +++ b/webif/html/diag/queue/style.css @@ -39,7 +39,7 @@ div#loading, div#nodata #lastscan { - color: #ccc; + color: #999; background: transparent; font-style: italic; padding-top: 2px; diff --git a/webif/include/helplinks.jim b/webif/include/helplinks.jim index ccfbe4e..e0cd863 100755 --- a/webif/include/helplinks.jim +++ b/webif/include/helplinks.jim @@ -26,3 +26,5 @@ helplink "Things Every
Owner Should Know" "/img/started.png" \ helplink "Twitter
Feed" "/img/silver-twitter-bird-button.png" \ "http://twitter.com/HummyPkg" +eval_plugins helplink + diff --git a/webif/lib/ts.class b/webif/lib/ts.class index f8e79a1..2d8596a 100644 --- a/webif/lib/ts.class +++ b/webif/lib/ts.class @@ -242,10 +242,10 @@ ts method fileset {} { proc {ts fetch} {file {checked 0}} { # Check that this is a .ts file which has at least one sidecar - # file (.nts) + # file (.hmt) if {!$checked} { if {[file extension $file] ne ".ts"} { return 0 } - if {![file exists "[file rootname $file].nts"]} { return 0 } + if {![file exists "[file rootname $file].hmt"]} { return 0 } } if {[file extension $file] ne ".ts"} {