From 15e33ab751c816392519a191809763ff35d231ec Mon Sep 17 00:00:00 2001 From: hummypkg Date: Thu, 3 Nov 2011 23:43:17 +0000 Subject: [PATCH] add crop git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@501 2a923420-c742-0410-a762-8d5b09965624 --- var/mongoose/cgi-bin/browse.jim | 20 ++- var/mongoose/cgi-bin/browse/browse.js | 15 +- var/mongoose/cgi-bin/browse/crop.jim | 155 ++++++++++++++++++ var/mongoose/cgi-bin/browse/file.jim | 16 +- var/mongoose/html/css/jquery.contextMenu.css | 18 +- var/mongoose/html/css/style.css | 22 +++ var/mongoose/html/img/context/cut.png | Bin 0 -> 648 bytes var/mongoose/html/img/context/delete.png | Bin 0 -> 431 bytes var/mongoose/html/img/context/door.png | Bin 0 -> 412 bytes var/mongoose/html/img/context/edit.png | Bin 0 -> 814 bytes .../html/img/context/page_white_copy.png | Bin 0 -> 309 bytes .../html/img/context/page_white_delete.png | Bin 0 -> 536 bytes .../html/img/context/page_white_edit.png | Bin 0 -> 618 bytes .../html/img/context/page_white_paste.png | Bin 0 -> 620 bytes var/mongoose/html/img/context/plus.png | Bin 0 -> 511 bytes var/mongoose/lib/ts.class | 25 +-- 16 files changed, 238 insertions(+), 33 deletions(-) create mode 100755 var/mongoose/cgi-bin/browse/crop.jim create mode 100644 var/mongoose/html/img/context/cut.png create mode 100644 var/mongoose/html/img/context/delete.png create mode 100644 var/mongoose/html/img/context/door.png create mode 100644 var/mongoose/html/img/context/edit.png create mode 100644 var/mongoose/html/img/context/page_white_copy.png create mode 100644 var/mongoose/html/img/context/page_white_delete.png create mode 100644 var/mongoose/html/img/context/page_white_edit.png create mode 100644 var/mongoose/html/img/context/page_white_paste.png create mode 100644 var/mongoose/html/img/context/plus.png diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim index ecb26eb..cee9442 100755 --- a/var/mongoose/cgi-bin/browse.jim +++ b/var/mongoose/cgi-bin/browse.jim @@ -2,7 +2,7 @@ package require cgi source /mod/var/mongoose/lib/setup -require ts.class pretty_size +require ts.class pretty_size system.class puts "Content-Type: text/html" puts "" @@ -82,6 +82,7 @@ proc entry {file} {{i 0}} { set locked 0 set encd 0 set def unknown + set bx 0 if {$type eq "ts"} { # HD / SD if {[$ts get definition] eq "HD"} { @@ -114,6 +115,8 @@ proc entry {file} {{i 0}} { src=/images/174_1_26_GuidancePolicy.png height=21>" } + + set bx [$ts get bookmarks] } # Opt+ button @@ -121,7 +124,7 @@ proc entry {file} {{i 0}} { puts "
@@ -129,11 +132,7 @@ proc entry {file} {{i 0}} { puts "" } -if {[dict exists $_cgi dir]} { - set dir [dict get $_cgi dir] -} else { - set dir "/media/My Video" -} +set dir [cgi_get dir [system mediaroot]] ###################################################################### # Render web page @@ -145,12 +144,17 @@ puts { + +} + diff --git a/var/mongoose/cgi-bin/browse/file.jim b/var/mongoose/cgi-bin/browse/file.jim index 72b7e3e..e82a8ae 100755 --- a/var/mongoose/cgi-bin/browse/file.jim +++ b/var/mongoose/cgi-bin/browse/file.jim @@ -79,16 +79,22 @@ if {$type eq "ts"} { $sz " set dlna [$ts dlnaloc] +lassign $dlna url if {[llength $dlna]} { - puts "DLNA URL[lindex $dlna 0]" + puts "DLNA URL + $url" } puts " Flags - [$ts get flags] - - - " + [$ts get flags] +" +if {[$ts get bookmarks]} { + puts " \[Bookmarks: [$ts get bookmarks]\]" +} + + puts "" + puts "" exit } diff --git a/var/mongoose/html/css/jquery.contextMenu.css b/var/mongoose/html/css/jquery.contextMenu.css index a18aac0..71be894 100644 --- a/var/mongoose/html/css/jquery.contextMenu.css +++ b/var/mongoose/html/css/jquery.contextMenu.css @@ -54,9 +54,15 @@ classes to the respective LI element(s) */ -.contextMenu LI.edit A { background-image: url(images/page_white_edit.png); } -.contextMenu LI.cut A { background-image: url(images/cut.png); } -.contextMenu LI.copy A { background-image: url(images/page_white_copy.png); } -.contextMenu LI.paste A { background-image: url(images/page_white_paste.png); } -.contextMenu LI.delete A { background-image: url(images/page_white_delete.png); } -.contextMenu LI.quit A { background-image: url(images/door.png); } +.contextMenu LI.pwedit A { background-image: url(/img/context/page_white_edit.png); } +.contextMenu LI.pwcopy A { background-image: url(/img/context/page_white_copy.png); } +.contextMenu LI.pwpaste A { background-image: url(/img/context/page_white_paste.png); } +.contextMenu LI.pwdelete A { background-image: url(/img/context/page_white_delete.png); } +.contextMenu LI.edit A { background-image: url(/img/context/edit.png); } +.contextMenu LI.copy A { background-image: url(/img/context/copy.png); } +.contextMenu LI.paste A { background-image: url(/img/context/paste.png); } +.contextMenu LI.delete A { background-image: url(/img/context/delete.png); } +.contextMenu LI.cut A { background-image: url(/img/context/cut.png); } +.contextMenu LI.quit A { background-image: url(/img/context/door.png); } + + diff --git a/var/mongoose/html/css/style.css b/var/mongoose/html/css/style.css index b85f240..ae6d7b1 100644 --- a/var/mongoose/html/css/style.css +++ b/var/mongoose/html/css/style.css @@ -263,3 +263,25 @@ input.text border: 2px solid red; } +div.cut, div.keep +{ + position: absolute; + top: 0px; + text-align: center; + overflow: hidden; + border-radius: 5px; + -moz-border-radius: 5px; +} + +div.keep +{ + background: green; + color: white; +} + +div.cut +{ + background: #ff4000; + color: black; +} + diff --git a/var/mongoose/html/img/context/cut.png b/var/mongoose/html/img/context/cut.png new file mode 100644 index 0000000000000000000000000000000000000000..f215d6f6b7c81ab344a3e53e0e5e756c58c82d90 GIT binary patch literal 648 zcmV;30(bq1P)Sxb0Y6MkDSd{nPwTp^L>b`TxVmKBiF^NLQ>My+_!0?|)hBPe_#}P$?rlUF;M20U z`oNWE|K(DrsR+gN%g)?+`OfqmmmiA8O_U(YfPnV(E$8mN{jZQVJ-L7LxzmTQJ^!PS zHqDyoKn&^H)Oq>Q$Nzns&wsn~^6P)|vPC&W#R9Kw95|FC`?q!91!~-K_R;^uDLWSs zj7A}sG%2IZxvQP(HeS-nn71T-`ku2F9(?#8KXKbp!Qe&~yaot4r%3=c-cDF`=YPn& z3!hUrzxqFO*Ny)VU;p?Y-nniMuVuI+UIUD>=B$ZZdhM^2Z-JeJcbDl-H)3?9>AG_?ve_7A86r2Wlb?y7)ShoTkzeah}rl)Oq{=a0=sekDkpZ?d4n{v>% zcgJPxg7sgx4Lmup8sO5j^?B5iYcCv|)*VgT_U6A?-trsfIcr`APCfD&B(EM;R_0K# z{lAb!kTg~UrQ ilDgypkCC?sx*7nfi&SPz~8F&Vk~xHPSBL-i}kmSOjZsDs=?gA5`9dz+Oc~F@#6P{lw?p z)$jU_Bz>=&7hM|~XQdT3`_z-wUba(3ZaprqzgDxAyXWM0H?^wEt@qlq7nXNjJZcp= z&qAhONkGqRn%%T?Uc3KSWaD$f`FghgZ%glq*}3rC2k(zLcTeW;o%#3QEji7Ja+=Y< z1+DJ?;n%thM>W-PO4z!6ryTDvQjnlZlgy>*`kliP$?n1x#3mBv=H* zZvSv|{Wk%bFo}=%C%C=cB-|2gZto+r=@*a)F<})kF(DFGf{cEF%qX{I6ar>BlQ09$ zKtwM=E70{BMdbz}7ZEfCIhx`>6H;PlIK|!Y1xVX8?flcwAM>e&;Vo+^1rYJ?J$S{X!%NaOR z$*CooCYmW0lnU}92%#|)c?l6TK)8B*)LL2hc7Hj~&hNg?b50C}DF2W+7BLCbNZi3y zUhKXf#L~{S_03xGtWd&UA7#(3c*=pqc*>4AiZAWZ?g;r^Rh1uWX{tEl?U%yy{pAc{?NrJ@%e{oY=d4#vrB@*q=E2x;8Lpu-m{yj+ z<*{Np3TEtn4g zQ=TYBtt;rz1;F6`1#BSun@dxkb>%0K$kGO4B93F7{|eg@FtZ3~ol#ul>2RJs@jJn0 zlGHn5`pv@o=q^geoa88i>H@fRA zus9}wd9)fbSt~x8-Q;xjLKGS0+CTrnW`ZjXGxXecJ2*XN6h9TARdO3I9-alin1Od= zT1*g|KiMO=RHjD?OT9HgPK%vhNxVF{H3X4r0e3sqU^NVb`%($HX_4GKVv8W1ZNSNV z&A)+L%{JtTt;lJ#B1>onlWzjEN)KkG7MT@VFgONc`s9Cs?Ki};v@Fpy*-U|vmQgW9 sV{j*F=ZeQ^#NE?QvD7qT`dY{Q1d#d@seb#jPyhe`07*qoM6N<$f)GG)O8@`> literal 0 HcmV?d00001 diff --git a/var/mongoose/html/img/context/page_white_copy.png b/var/mongoose/html/img/context/page_white_copy.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f31a278e17993d8d4e13beac2f9d5f7b42d08f GIT binary patch literal 309 zcmV-50m}Y~P)(?iiXTHIMmcoLoO94I8;j@ zv^2DJ5#orqydFJX|Gm$_Bi_vyew+j6{r}$Qc@D1%fQqeAhJj)1!z4pP83k2MV2~s! zSt^w(<#HLFVBg_#xz1W8ioi(WY&Hu~6zil?DI^jJgu`K35(hkP)H%@Imesbg#5!Ps_$Ni*SiR8&sKb9?M`0-mH)gtg&YgRX#*TXz@Z+| z;|2H@xzE0TfuORhuO2k6#K8#sW^J`mQ0+E@$K`QkFV+DTlI$w{GJ;zid{*v9xeIe_ z$|Bp`@iKkgoFK3{4Z)#DWKV~W4K@5WZN+Ql_7%YxNqSx7%cWud&cX>)_PvD*UzxZg a%Kia9Rjz_59@~-t0000$>5Y&axjp2O=VLu>*f>1L;s0)kkvKC!*u?s6CVL=HJ6oP~pNfZc; zsKr=bq;7MITw8NXw{SZm%59TId2x_9BQ zV86`NuvGI!>o^V!Na!=$7GJE{Cq`b+XwknM{UcGHFTTfmuS+ zm-zYC!P3+zmY;SG$?!fYkOih`QYaLxyF}A86h$GGN}kFj)_o*0e zjPMP%zTG7FYMAfO2Nn1D`D0Cj?Wl>5q%@CE10nX)KxpNmwk+!IWkzywiYD( zqUXiYYIq3qcRyMGJ;IY`(Gz~E$J$zu2+R{)xGlE*88b3WK6V*J>}2iPY1HH|tER0W z_+^^FdppY?o)Gt5M2`%xwRDH@R3G}^i1l4|6uchm0X0f!@&YdVLB5K&dd7Rv{)DXX zt^&vP;}kqj3f>94j+4xd93>s|Q!Ezi>?r8(Il$P}PFxSqu{d*!Y%*#cX(R0f|Juz# z3o0_xI14Al->1uky@W-rCI_%l&>4A_ab^avY?n0hpS-#mn_4{O$e%cm-@NH=3`90Wq+3`~HKArSdfX`&Z12 z(CY$VW-MNtXX4xy%yUeE?}*~0-|iByA@ZrwXgph4S*bhcc5{HB!DFVm_v}P*g7+Q~K}7K0lcp(^N@X>U zV`{ZpeIf${R6Hgg4FL^`X$Eu75k(PE6ycl$AW0Ic)#@rR7Z(7;V?i-dR1K935Jgcx zPfkwK>2wGokf!Nih^ARp6-6arYFG#(9Ta!x93nFEjoA==z(g?#sDg?Owk?Mg7K+>l zWYsf(<`#+$h9Sp6gFOg_dd+80SkUpk&xM7h0`Sov9W73spU;GP073|VfZ&Gd$J$*0<~TV5aPS|qWH57|VJz+d0000VOCBTkoq#b((e(5J7Ho?IyOO7>|2bu>X9<;{QvD|b+E4tEYT!1?`U8QhoU z474Of#Un#22l0L1Y-WYvkbGvU20%NKAs~l2VSK|dzh{YQm8x2UlCVQWDyq}GDSu~od(UCc9FS>t?rwIS;=N^Aczk*&WI!*( zajexOV9wLeDLl_J^phA$nqb?uv#fpq-0Qom3cuBjHAgliUY^Hp#V9m|6o7}MSRbW} zIY{OcNGZ*0me_*8pG7QmfiyCMlC%?3L~b9W+LrE472uZoeUtWly#egE3|2=PfH0lB zGa9T>VXBTZyeyc79WDakgI;e_a0hy??~1`S6nMWvx{R@GV3-WwPe#V_h9TWKDZvTp zE6lh-aEe0c>TovvUR&3=Ubq0{|qK-+|n-C2;@%002ovPDHLkV1g%x B;L892 literal 0 HcmV?d00001 diff --git a/var/mongoose/lib/ts.class b/var/mongoose/lib/ts.class index 44fa316..2c0b217 100644 --- a/var/mongoose/lib/ts.class +++ b/var/mongoose/lib/ts.class @@ -16,10 +16,13 @@ class ts { flags "" error "" guidance "" + bookmarks 0 } -ts method duration {} { - return [expr [expr $end - $start] / 60] +ts method duration {{raw 0}} { + set d [expr $end - $start] + if {!$raw} { set d $($d / 60) } + return $d } ts method size {} { @@ -30,15 +33,15 @@ ts method size {} { ts method _parse {line} { set vars [split $line "\t"] - set title [lindex $vars 0] - set synopsis [lindex $vars 1] - set definition [lindex $vars 2] - set channel_num [lindex $vars 3] - set channel_name [lindex $vars 4] - set start [lindex $vars 5] - set end [lindex $vars 6] - set flags [split [string range [lindex $vars 7] 0 end-1] ,] - set guidance [lindex $vars 8] + lassign [split $line "\t"] \ + title synopsis definition channel_num channel_name \ + start end flags_list guidance bookmarks + + set flags [split [string range $flags_list 0 end-1] ,] +} + +ts method bookmarks {} { + return [exec /mod/bin/hmt -bookmarks $file] } ts method flag {f} {