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

add nospecial to ts iterate, centralise is-specialdir logic

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3882 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2017-03-05 10:21:58 +00:00
parent 92a0cbd01b
commit 20b4fe2f66
4 changed files with 13 additions and 7 deletions
Show Stats 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.4.0-15 Version: 1.4.0-16
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hpkg.tv 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) 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)

5
webif/lib/auto/util.jim
View File

@ -119,10 +119,7 @@ proc ::auto::inuse {ts} {
} }
proc ::auto::specialdir {dir} { proc ::auto::specialdir {dir} {
if {[string match {\[*} [string trimleft [file tail $dir]]]} { return [system specialdir $dir]
return 1
}
return 0
} }
proc ::auto::elapsed {start} { proc ::auto::elapsed {start} {

7
webif/lib/system.class
View File

@ -809,3 +809,10 @@ proc {system endop} {op} {
return 0 return 0
} }
proc {system specialdir} {dir} {
if {[string match {\[*} [string trimleft [file tail $dir]]]} {
return 1
}
return 0
}

6
webif/lib/ts.class
View File

@ -476,7 +476,7 @@ proc {ts resetnew} {dir} {
close $fd close $fd
} }
proc {ts iterate} {callback {verbose 0} {dir ""}} {{rootdev 0}} { proc {ts iterate} {callback {verbose 0} {dir ""} {nospecial 0}} {{rootdev 0}} {
require system.class require system.class
if {$dir eq ""} { if {$dir eq ""} {
set dir [system mediaroot] set dir [system mediaroot]
@ -491,9 +491,11 @@ proc {ts iterate} {callback {verbose 0} {dir ""}} {{rootdev 0}} {
if {$st(dev) != $rootdev} return if {$st(dev) != $rootdev} return
} }
if {$nospecial && [system specialdir $dir]} return
foreach entry [readdir -nocomplain $dir] { foreach entry [readdir -nocomplain $dir] {
if {[file isdirectory "$dir/$entry"]} { if {[file isdirectory "$dir/$entry"]} {
ts iterate $callback $verbose "$dir/$entry" ts iterate $callback $verbose "$dir/$entry" $nospecial
continue continue
} }
if {![string match {*.ts} $entry]} continue if {![string match {*.ts} $entry]} continue