From 89a68cf53849459d52d29c369835b0ff53790934 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 24 Jun 2012 20:45:07 +0000 Subject: [PATCH] updates git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1081 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- var/mongoose/cgi-bin/browse.jim | 3 +++ var/mongoose/cgi-bin/browse/browse.js | 3 ++- var/mongoose/cgi-bin/browse/strip/strip.jim | 6 +++--- var/mongoose/html/img/clock.png | 1 + var/mongoose/html/img/context/clock.png | Bin 0 -> 483 bytes var/mongoose/lib/bin/auto | 13 ++++++------- 7 files changed, 17 insertions(+), 13 deletions(-) create mode 120000 var/mongoose/html/img/clock.png create mode 100644 var/mongoose/html/img/context/clock.png diff --git a/CONTROL/control b/CONTROL/control index 462533a..aa9c27c 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.9.12-2 +Version: 0.9.12-5 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.0.4) +Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.0) 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 db2b56e..5aaffc9 100755 --- a/var/mongoose/cgi-bin/browse.jim +++ b/var/mongoose/cgi-bin/browse.jim @@ -214,6 +214,9 @@ proc entry {file} {{i 0}} { # Shrunk (shown when necessary via Ajax) icon "/img/compress.png" "Shrunk" \ "id=\"sp_$tbfile\"" "va hidden" + # Timeshifted (shown when necessary via Ajax) + icon "/img/clock.png" "Time-shifted Recording" \ + "id=\"tsr_$tbfile\"" "va hidden" set bx [$ts get bookmarks] } diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js index 6f8822b..48af8fe 100755 --- a/var/mongoose/cgi-bin/browse/browse.js +++ b/var/mongoose/cgi-bin/browse/browse.js @@ -267,7 +267,8 @@ function preparemenu(el, menu) $(menu).enableContextMenuItems('#delete'); } - if (el.attr('odencd') == 1 && el.attr('dlna') == 1) + if (el.attr('odencd') == 1 && el.attr('dlna') == 1 && + el.attr('encd') == 0) $(menu).enableContextMenuItems('#decrypt'); else $(menu).disableContextMenuItems('#decrypt'); diff --git a/var/mongoose/cgi-bin/browse/strip/strip.jim b/var/mongoose/cgi-bin/browse/strip/strip.jim index 8f262fe..eb1089f 100755 --- a/var/mongoose/cgi-bin/browse/strip/strip.jim +++ b/var/mongoose/cgi-bin/browse/strip/strip.jim @@ -38,7 +38,7 @@ Your original recording files will be retained in a folder called _original. Length:[clock format $len -format %T] Size:[pretty_size [$ts size]] ([$ts get definition]) Time: -Squeezing will take around [clock format $esttime -format "%T"] +Shrinking will take around [clock format $esttime -format "%T"] Estimated Saving: Analysing file, please wait... @@ -51,11 +51,11 @@ Your original recording files will be retained in a folder called _original. > diff --git a/var/mongoose/html/img/clock.png b/var/mongoose/html/img/clock.png new file mode 120000 index 0000000..80cffd4 --- /dev/null +++ b/var/mongoose/html/img/clock.png @@ -0,0 +1 @@ +context/clock.png \ No newline at end of file diff --git a/var/mongoose/html/img/context/clock.png b/var/mongoose/html/img/context/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..43862ee4e9efbe5c24cb71c17d209678dc109245 GIT binary patch literal 483 zcmV<90UZ8`P)Cc?s;VO+BN`eSo12^5+}w?gjn>xI%F4>{@bD=qDK#}UP*6}6 z6%~q#isabc#@Km`T6;W#mZ#>006T|L_t(|+Dwn<7J@JgM#HFp0^$G> z1i`)cp5*;s%FyD`{^-ef+oZjqA}wEOw)J6)Divrel~Xg@N9RhN0)b`lo+Hx{v*4bC zzBi+Tj9=9(goaebFF;u{!0yz304H7075oF)6~+TzIReNM#C*gdv^j7u@XA{r>jXth z3_cA#Nsh?)?9#JaG*(5HZw8?39gB#&O_G1z(wNAjw8vdYE;Jd7Bq7K3UDBT}xc*0g Z0RT%}Ez@P&QuF`-002ovPDHLkV1jZ9+#mn| literal 0 HcmV?d00001 diff --git a/var/mongoose/lib/bin/auto b/var/mongoose/lib/bin/auto index 2d4dedc..252b08a 100755 --- a/var/mongoose/lib/bin/auto +++ b/var/mongoose/lib/bin/auto @@ -7,7 +7,6 @@ if {![acquire_lock webif_auto]} { puts "Cannot acquire exclusive lock, terminating." exit } -puts "Got lock." set tmp "/mod/tmp/webif_auto" if {![file exists $tmp]} { @@ -43,7 +42,7 @@ proc escape {str} { } proc dedup {dir} { - puts "DEDUP: \[$dir]" + #puts "DEDUP: \[$dir]" puts [exec /mod/webif/html/dedup/dedup -yes [escape $dir]] exec /mod/webif/html/dedup/dedup -yes [escape $dir] } @@ -52,7 +51,6 @@ proc do_shrink {ts} { global tmp dustbin set file [file rootname [$ts get file]] - puts " SHRINK: $file" if {[catch { set perc [exec /mod/bin/stripts -aq [escape $file]] } msg]} { @@ -66,9 +64,10 @@ proc do_shrink {ts} { } if {$perc == 0} { - puts " Already shrunk." + #puts " Already shrunk." return } + puts " SHRINK: $file" puts " Estimate $perc% saving." puts " Shrinking..." if {[catch { @@ -114,19 +113,19 @@ proc do_decrypt {ts} { set file [$ts get file] set rfile [file rootname $file] set bfile [file tail $file] - puts " DECRYPT: $rfile" if {![$ts flag "ODEncrypted"]} { - puts " Already decrypted." + #puts " Already decrypted." return } lassign [$ts dlnaloc] url if {$url eq ""} { - puts " Not yet indexed." + #puts " Not yet indexed." return } + puts " DECRYPT: $rfile" puts " DLNA: $url" exec wget -O "$tmp/$bfile" $url