git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1081 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2012-06-24 20:45:07 +00:00
parent 51db7b1e36
commit 89a68cf538
7 changed files with 17 additions and 13 deletions

View File

@ -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.

View File

@ -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]
}

View File

@ -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');

View File

@ -38,7 +38,7 @@ Your original recording files will be retained in a folder called _original.
<tr><th>Length:</th><td>[clock format $len -format %T]</td></tr>
<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
<tr><th>Time:</th>
<td>Squeezing will take around [clock format $esttime -format "%T"]</td></tr>
<td>Shrinking will take around [clock format $esttime -format "%T"]</td></tr>
<tr><th>Estimated Saving:</th>
<td class=va><span id=analysis class=va>
<img class=va src=/img/loading.gif> Analysing file, please wait...
@ -51,11 +51,11 @@ Your original recording files will be retained in a folder called _original.
></span>
<div id=stripdiv class=hidden style=\"padding: 1em\">
<button id=stripit>Perform squeeze operation</button>
<button id=stripit>Shrink recording</button>
</div>
<div id=progressdiv class=hidden>
Squeezing: <div id=progressbar></div>
Shrinking: <div id=progressbar></div>
</div>
<button id=back class=hidden>Back to media list</button>

View File

@ -0,0 +1 @@
context/clock.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 B

View File

@ -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