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

auto fixes, webif queueactions can take parameters

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3886 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2017-03-05 19:35:40 +00:00
parent 20b4fe2f66
commit 7b6866cdb0
6 changed files with 31 additions and 14 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-16 Version: 1.4.0-17
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)

6
webif/html/browse/index.jim
View File

@ -411,8 +411,8 @@ if {$nicesplice} {
# Queue # Queue
set queueactions(decrypt) "Decryption" set queueactions(decrypt) "Decryption"
set queueactions(shrink) "Shrink" set queueactions(shrink) "Shrink"
set queueactions(mp2) "Audio-Extraction (mp2, fast)" dict set queueactions "mp3 -mp2" "Audio-Extraction (mp2, fast)"
set queueactions(mp3) "Audio-Extraction (mp3, slow)" dict set queueactions "mp3 -mp3" "Audio-Extraction (mp3, slow)"
set queueactions(mpg) "Conversion to MPG" set queueactions(mpg) "Conversion to MPG"
eval_plugins queueactions eval_plugins queueactions
@ -425,7 +425,7 @@ Queue for</button>
set rqueueactions [lreverse $queueactions] set rqueueactions [lreverse $queueactions]
foreach v [lsort [dict keys $rqueueactions]] { foreach v [lsort [dict keys $rqueueactions]] {
set k $rqueueactions($v) set k $rqueueactions($v)
puts "<option value=$k>$v</option>" puts "<option value=\"$k\">$v</option>"
} }
puts { puts {
</select> </select>

12
webif/html/browse/queue.jim
View File

@ -27,16 +27,10 @@ foreach file [cgi_get files] {
set ts [ts fetch $file] set ts [ts fetch $file]
if {$ts eq "0"} continue if {$ts eq "0"} continue
if {$act eq "mp2"} { lassign $act act args
set q [queue insert -hold $ts mp3]
} else {
set q [queue insert -hold $ts $act]
}
switch -- $act { set q [queue insert -hold $ts $act]
mp2 { $q set args "-mp2" } if {$args ne ""} { $q set args $args }
mp3 { $q set args "-mp3" }
}
$q submit $q submit
puts "</li>" puts "</li>"
} }

3
webif/lib/auto/NOTES
View File

@ -15,10 +15,13 @@ Module Scan De-queue
*flatten 750 - *flatten 750 -
*flatview 650 - *flatview 650 -
decrypt 600 900 decrypt 600 900
*arbookmarks - 500
*badnts - 500
shrink 400 800 shrink 400 800
mpg 300 300 mpg 300 300
mp3 300 300 mp3 300 300
*detectads 300 200 *detectads 300 200
*thumbnails - 100
Notes: Notes:

6
webif/lib/auto/deq
View File

@ -133,7 +133,11 @@ proc ::auto::runplugin {plugin fn args} {
} }
proc ::auto::runplugins {fn args} { proc ::auto::runplugins {fn args} {
foreach plugin [dict keys $::auto::plugins] { foreach plugin [lsort -decreasing -command [lambda {a b} {
if {$a ni $::auto::plugins} { return 0 }
if {$b ni $::auto::plugins} { return 0 }
return $($::auto::plugins($a) - $::auto::plugins($b))
}] [dict keys $::auto::plugins]] {
set rfn "::${plugin}::${fn}" set rfn "::${plugin}::${fn}"
if {![exists -proc $rfn]} continue if {![exists -proc $rfn]} continue
if {[catch {uplevel 1 $rfn {*}$args} msg]} { if {[catch {uplevel 1 $rfn {*}$args} msg]} {

16
webif/lib/system.class
View File

@ -114,6 +114,22 @@ proc {system systemid} {} {{id ""}} {
return $id return $id
} }
proc {system macaddr} {} {{mac ""}} {
if {$mac ne ""} { return $mac }
set fd [open /dev/mtd3 r]
$fd seek 0xc8c00
set bytes [$fd read 6]
$fd close
set tmac ""
foreach b [split $bytes ""] {
binary scan $b H* hex
if {$tmac ne ""} { append tmac : }
append tmac $hex
}
return [set mac $tmac]
}
proc {system serialno} {} {{serial ""}} { proc {system serialno} {} {{serial ""}} {
if {$serial ne ""} { return $serial } if {$serial ne ""} { return $serial }
set fd [open /dev/mtd3 r] set fd [open /dev/mtd3 r]