From 8d36fe22dda48d216f4a77c5000d476b673ee79f Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 22 Jan 2012 19:47:47 +0000 Subject: [PATCH] checkpoint webif git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@687 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 +-- var/mongoose/cgi-bin/browse.jim | 12 +++++++- var/mongoose/cgi-bin/browse/assets.jim | 2 +- var/mongoose/cgi-bin/browse/browse.js | 12 ++++---- var/mongoose/cgi-bin/browse/clipboard.jim | 6 ++-- var/mongoose/cgi-bin/browse/file.jim | 5 ++-- var/mongoose/cgi-bin/browse/play.jim | 32 ++++++++++++++++++++++ var/mongoose/html/img/dlna.png | Bin 0 -> 1838 bytes var/mongoose/lib/filecopy | 21 ++++++++++++++ var/mongoose/lib/setup | 5 ++++ 10 files changed, 83 insertions(+), 16 deletions(-) create mode 100755 var/mongoose/cgi-bin/browse/play.jim create mode 100644 var/mongoose/html/img/dlna.png create mode 100644 var/mongoose/lib/filecopy diff --git a/CONTROL/control b/CONTROL/control index a94a666..7d482bc 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.8.13-1 +Version: 0.9.0 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: mongoose(>=3.0-7),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.5),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2 +Depends: mongoose(>=3.0-7),jim(>=0.73),jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2 Suggests: ffmpeg,webif-iphone Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim index 277ed85..18fbe3a 100755 --- a/var/mongoose/cgi-bin/browse.jim +++ b/var/mongoose/cgi-bin/browse.jim @@ -30,6 +30,7 @@ if {$order eq "-"} { [settings new] sortorder $order } +set model [system model] set dustbin [system dustbin 1] proc directory {file bfile} { @@ -144,6 +145,7 @@ proc entry {file} {{i 0}} { set odencd 1 set def unknown set bx 0 + set dlna 0 if {$type eq "ts"} { # HD / SD if {[$ts get definition] eq "HD"} { @@ -181,6 +183,14 @@ proc entry {file} {{i 0}} { height=21>" } + # Indexed + if {$::model eq "HDR" && [llength [$ts dlnaloc]]} { + puts "\"Indexed" + set dlna 1 + } + set bx [$ts get bookmarks] } @@ -190,7 +200,7 @@ proc entry {file} {{i 0}} {
diff --git a/var/mongoose/cgi-bin/browse/assets.jim b/var/mongoose/cgi-bin/browse/assets.jim index ecfbc26..5d8dcc0 100755 --- a/var/mongoose/cgi-bin/browse/assets.jim +++ b/var/mongoose/cgi-bin/browse/assets.jim @@ -13,7 +13,7 @@ puts {
  • Download
    • } -if {[system model] eq "HDR"} { +if {$model eq "HDR"} { puts {
  • Decrypt
    • } } if {[system pkginst ffmpeg]} { diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js index 9c1c18f..ddb7a90 100755 --- a/var/mongoose/cgi-bin/browse/browse.js +++ b/var/mongoose/cgi-bin/browse/browse.js @@ -232,17 +232,15 @@ function preparemenu(el, menu) $(menu).enableContextMenuItems('#delete'); } - if (el.attr('odencd') == 1) - { + if (el.attr('odencd') == 1 && el.attr('dlna') == 1) $(menu).enableContextMenuItems('#decrypt'); - $(menu).disableContextMenuItems('#audio'); - } else - { $(menu).disableContextMenuItems('#decrypt'); + + if (el.attr('odencd') == 1) + $(menu).disableContextMenuItems('#audio'); + else $(menu).enableContextMenuItems('#audio'); - } - } else { diff --git a/var/mongoose/cgi-bin/browse/clipboard.jim b/var/mongoose/cgi-bin/browse/clipboard.jim index 70d772c..65a0587 100755 --- a/var/mongoose/cgi-bin/browse/clipboard.jim +++ b/var/mongoose/cgi-bin/browse/clipboard.jim @@ -102,9 +102,11 @@ switch $action { regsub -all {([\\["$])} $root {\\\1} root foreach f [glob -nocomplain "${root}.*"] { if {$mode eq "cut"} { - catch {file rename $f "$dir/[file tail $f]"} + catch {file rename $f \ + "$dir/[file tail $f]"} } else { - catch {file copy $f "$dir/[file tail $f]"} + catch {file copy $f \ + "$dir/[file tail $f]"} } } } diff --git a/var/mongoose/cgi-bin/browse/file.jim b/var/mongoose/cgi-bin/browse/file.jim index 7c81b63..c5450a1 100755 --- a/var/mongoose/cgi-bin/browse/file.jim +++ b/var/mongoose/cgi-bin/browse/file.jim @@ -85,9 +85,8 @@ if {$type eq "ts"} { Size $sz " -set dlna [$ts dlnaloc] -lassign $dlna url -if {[llength $dlna]} { +lassign [$ts dlnaloc] url +if {$url ne ""} { puts "DLNA URL $url" } diff --git a/var/mongoose/cgi-bin/browse/play.jim b/var/mongoose/cgi-bin/browse/play.jim new file mode 100755 index 0000000..4fc7933 --- /dev/null +++ b/var/mongoose/cgi-bin/browse/play.jim @@ -0,0 +1,32 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/var/mongoose/lib/setup +require ts.class pretty_size + +puts "Content-Type: text/html\r\n" + +cgi_input +#cgi_dump + +header + +set rfile [cgi_get file] +set ts [ts fetch $rfile] +if {[catch {$ts get file}]} { + puts "Invalid TS file, '$rfile'" + exit +} + +puts { + +
    +VLC Player +
    +} +puts "Now playing: $rfile, [$ts duration] minutes." +puts { +
    +
    +} + diff --git a/var/mongoose/html/img/dlna.png b/var/mongoose/html/img/dlna.png new file mode 100644 index 0000000000000000000000000000000000000000..915e486985022ccf80b08b08dc71f32c46f9bd8b GIT binary patch literal 1838 zcmV+}2hsS6P)KDF+z zb`1>BC@%dXumSX=6CDf`k$BP+>g&MFT|dNh_DIx+q(z0CtlmrzqcW12T>xx zb36!~z=WRjJk=aK2NWHO;6Yz)Y4Q*Goq-W&pKsw#;_j8FCh-2}?;d=8@6IEgVUI(= z5dtroz&u|8r@|aae>wAS}=n6|>s1)+AG*P*4=O zc>QK#dSQ-QpRP{b7y7nM_V#+hicti`D1f3Dp{VB}x9o-Umu`ov)3fA(XjglkEZS7C z2|S3F`_1*QL_JqUfPf2{g1aMUFW*Q)3`VKt)Qhd5#<78(U|8ew6)#%kYwIP3g>rZu zfvzp>QC=!+Ru&$6NI2iV-Tm_5){gkggTwJ)jUPfGCls_S4S)^DiaG}a9evT0FtMJ1 z%Oyp0qM8N8ta0o^k6hk>skuewiO%LAcw8n)LQFr<3h4LoFx(#k&CpSb>>e%8q&yG1 zz|J{GA+jL|?G8aUN)J%YQiz9{g$yMAxDrcc(_?g;e9b?)tG_Qcw6z)U>(*FP);$ka z3Q}$TH>!-~UIA8?wYgz)6Dyk!6 z4O5ZjF0KMWl+F&f+}}MMl>{dgwG0*&rQ&u37kCL~{?5Q^E)PDp3+fvs1X=@{Ri;pI zlK>?o7Tt+z0(7zA&fL^Es4g6&GEu2ERLh+z|T^O2v=-kCHsfsJ9yK<8ugXizJ)fYmjvCqUb%8&^{)CF6#|svVr7pKY&p(aXdp zctB#}W|GA^v#_YZw?F(IpIcgtlwt(+nfd!m(S>=1c}mr(R!u=dnPn4e!xGS1jsX_F zI|pOf_l?}T^{}ei30PMcs**>5^5rL_=Bp)oz zD)C3#G_h(IOMiUy!*EU45=flH)>g!Rz}yQAYh$AE;bCEf+jY2QMxM0xfpTf3J*2-u zha8Q5mIVq+KYbyPnqN-FHf>62ANb;)?s3ky%)r@ZL>m(@dji(|SdWx~5DGq+NvA@_xjU_aS zQA$X>6IOl!UJPRy?`! zUaO@7W9@bIwl>i3%kXfDkKdi1eUGN)bAL5+`uHK>4cX~8@8zu|