From 23438a612267399414e2105ec96ad72eb8a3d320 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Thu, 18 Jun 2015 20:58:48 +0000 Subject: [PATCH] remove integrated flatten git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2429 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/browse/assets.jim | 3 --- webif/html/browse/index.jim | 1 - webif/html/browse/script.js | 13 ------------- webif/html/img/flat-tyre.png | Bin 2377 -> 0 bytes webif/html/sched/script.js | 12 +++++++++--- webif/lib/bin/auto | 18 +++++++++++++----- webif/lib/browse.class | 11 ----------- webif/lib/plugin | 10 ++++++++-- 9 files changed, 31 insertions(+), 39 deletions(-) delete mode 100644 webif/html/img/flat-tyre.png diff --git a/CONTROL/control b/CONTROL/control index c304d93..2f9ad73 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.2.3 +Version: 1.2.3-1 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.3),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>2.0.3-3),auto-unprotect(>=2.0.0-1) diff --git a/webif/html/browse/assets.jim b/webif/html/browse/assets.jim index 69a4f65..10e2217 100755 --- a/webif/html/browse/assets.jim +++ b/webif/html/browse/assets.jim @@ -96,9 +96,6 @@ if {$model eq "HDR"} { } } -if {$flatten} { - puts {
  • No-Flatten
    • } -} puts {
  • Auto-Expire Options
    • diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index c10bb78..9678d8c 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -14,7 +14,6 @@ eval_plugins browse header set nicesplice [system pkginst nicesplice] -set flatten [system pkginst flatten] set ignore {.nts .thm .hmi} set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt .m4v} diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js index 5a93a39..07169f2 100755 --- a/webif/html/browse/script.js +++ b/webif/html/browse/script.js @@ -389,15 +389,6 @@ function fixdmenu(el, menu, flag, tag, descr, recurse) function preparedmenu(el, menu) { - if (el.attr('noflat') != undefined) - { - if (el.attr('noflat') > 0) - $(menu).changeContextMenuItem('#flat', 'Allow Flatten'); - else - $(menu).changeContextMenuItem('#flat', - 'Prevent Flatten'); - } - fixdmenu(el, menu, 'autoshrink', '#shrink', 'Auto-shrink', 1); fixdmenu(el, menu, 'autodedup', '#dedup', 'Auto-dedup', 0); fixdmenu(el, menu, 'autodecrypt', '#decrypt', 'Auto-decrypt', 1); @@ -666,10 +657,6 @@ var dmenuclick = function(action, el, pos) $('#aexpiry').dialog('open'); break; - case 'flat': - flagdir(file, 'noflatten', iconset, results, el); - break; - case 'dedup': flagdir(file, 'autodedup', iconset, results, el); break; diff --git a/webif/html/img/flat-tyre.png b/webif/html/img/flat-tyre.png deleted file mode 100644 index 560fb489749b118ec749f82727bfd6baa3b01b55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2377 zcmV-P3AXl$P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2;NCVK~!i%?O1zk zQ`Z?kzSq8f#UxIFBqR-tP#z{D&Bz17BMot0b$osO3Mr5Ts9=mDy0jXPwlsl;XA;Q6 z@wJokY>}F6RX3!yQ>U%cI>9=1-9ww!F{VueZQV4+UI_!yc;9!79Xs*8*8{ff53Y11 z``&ZD^E==9zTfvdhmeQQLk~=e2RN8DO;1Qp8X>c>83@UQcPUeXMrKltiI4@xIc00L zMH>(6%Ab2vV}0odY)!{6)wKtIjSYXZ)|WrfKk=nuZRwVF(_@vk3_@m3$wE>IF{k7d zIJITl&uHonU15d(F;&Bv5Lx>gw6h_CzrCl!jlPF>@D2Mw-;k#6@MT^3^FH(Z@|FLq z1?W<;m$B2(XRbxA*+cT->z$zQ7yimTiPM{3mIE zfY zIBub)X8+}Icq9qh6%5lKQX;Yj<^r||P2xA~lhlsDoG>?M@4jfUSg@!mKNdnb?TTl< z5(b?F#UYrr=KvIV*Ck$pF~`8un~2L_LmU3aclZta(7s7705E86ogK=kp@(r^#X8nG zFs4j*;1%?udvJ_6gJ+04P^35k_HhMI(J?qyX*Yo`8JBq5Y(KDA);3hcG|sy3BU)IL zyp5i75B`D(13XD;ZhF9oye+dyX}cyKJ*Py!EFR8VaVd~cx?cr{n~!n=yz#$2`uM%@Vd(B6BF7=%bvf4wRMjW&#Tf#utd9u zMhM>vIUIgcG8e7ZtZIE*XWhF8{;KdD=MgQ??;5nL5K4>gcAcTi=iBsU+gsZRVIt!- z&dz-B=%{Q?Atu59he!CMpgbl##*&RYRNhna+>2D_7-)|jsC*$r8*Q>XdksS&xG ztL^x)Y-z_N62wyp)FO!gh>c-w?JF0_=C?yC!GDc-zfARnsi>)mLC?h20sM^% za0g1Uk72P;4Ne-veypR{9tDwaUjl3e6Hz;$QZ?=m!6XSxW}BgBB9dbR(~-dTSvlb^213E(AtiEO`b>3gcyhK zdlLuhD)(Msn%{yX^?giQPD?66ees5!YNvk;a_JLYY=VJ7h_#vOnvN^7nuXSpz}ZQ_ zb+#kBRB~k(wov6B8cVSqT@^c+b%6M3`8s;zGVydn?E&T>Buk%L;+ZkKI2w-}f4r6U z!|>tbwYxswxsyTWkqQ%xg0PC*J_&egRoml?Qyi0(v{1b?e9y(W!I+$$(_ZjKUgW)Y z*_Lj`dlLEk1G1qroV@iH3?La^fH>U@|EL(l2PEbkb#yU`OrpZLgzE*@JbsYG0C^Q)}nXJf$;IlEYP4UT7MjENfw<5QD6wW{97e$nXS818Nv5^l#sH* z9?CBR3ousfZU=2WE~1n;@9uZdy1Dw2r-NuiQf5RzQ;i~CC5g0n?0g*G^Q_`22#tcL zP!xfP`gUr8t0Ec9(+Ej7&RyBaRqeY(1ywTlk0^tar~`y}+c?HC@I&HNI8Gt>yVng6 z({}*OJNlxH+o$CelmI8@f;Py)rX^&aF=Ii6p}@0?tK9P)xMsc`z0OcND2H#*K8&rf zvJNshx@uIOSAk)Yyoo~3L4qNrvGpfL)pdt{qpjKhb8PC`L%(J1Cq^jU(VKxJZ+Y=L z+BF16I?(XRK1;EZ+KydSjP;2gqtXBXMlSRt7yS4xStmqn(u0F|Fj>q5&Sj>QtVIss z;OnvnXQgev-|w(H+PaQyioo@H{VaW9V<*Jw`|A4Rqtx3-{512YprKypd;X?-V%JGi zp(pN)8n+m2*%vD4Wl;FulR1vEyzA#=*B<)RU*qKSqS! vJX*g0pW6E21;iW7RScVl9UgjMvIqVRLd6PT!8jKU00000NkvXXu0mjf)cT&& diff --git a/webif/html/sched/script.js b/webif/html/sched/script.js index 601d334..f5f1007 100755 --- a/webif/html/sched/script.js +++ b/webif/html/sched/script.js @@ -301,10 +301,16 @@ $('#manrsv').dialog({ if (s) data.push({ name: "start", value: s.getTime() / 1000}); - var s = $('#mretime').timepicker('getTime', + var e = $('#mretime').timepicker('getTime', $('#mredate').datepicker('getDate')); - if (s) - data.push({ name: "end", value: s.getTime() / 1000}); + if (e) + data.push({ name: "end", value: e.getTime() / 1000}); + + if (s.getTime() >= e.getTime()) + { + $('#mrerr').html('Invalid time range...'); + return; + } $('#mrerr') .html(' Creating event...'); diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto index a4db844..b0e5728 100755 --- a/webif/lib/bin/auto +++ b/webif/lib/bin/auto @@ -10,6 +10,8 @@ set audiomp3 [$settings audiomp3] set modules {decrypt dedup shrink mpg mp3 expire} +set root [system mediaroot] + set logfile "/mod/tmp/auto.log" set logfd "unset" @@ -72,6 +74,13 @@ proc inuse {ts} { return [$ts inuse] } +proc specialdir {dir} { + if {[string match {\[*} [string trimleft [file tail $dir]]]} { + return 1 + } + return 0 +} + proc elapsed {start} { return $(([clock milliseconds] - $start) / 1000.0) } @@ -121,7 +130,7 @@ proc runplugin {name {ts 0}} { } } -eval_plugins auto +eval_plugins auto 1 set scanstart [clock milliseconds] log "-------------------------------------------------------" @@ -667,7 +676,7 @@ proc scan_run {dir flag callback} { if {$dir eq $dustbin} return - if {[string match {\[*} [file tail $dir]]} return + if {[specialdir $dir]} return if {[file exists "$dir/.$flag"]} { $callback $dir } @@ -691,7 +700,7 @@ proc xscan {dir attr {force 0} {recurse 1}} {{indent 0} {forceflag ""}} { return } - if {[string match {\[*} [file tail $dir]]} { + if {[specialdir $dir]} { # Special folder file stat "$dir/" st if {$st(dev) != $::rootdev} { @@ -737,7 +746,7 @@ proc scanup {dir flag} { set rl [string length $root] while {[string length $dir] >= $rl} { - if {[string match {\[*} [file tail $dir]]} { + if {[specialdir $dir]} { return -1 } if {[file exists "$dir/.auto${flag}r"]} { @@ -770,7 +779,6 @@ proc scansingle {dirs} { } } -set root [system mediaroot] file stat "$root/" rootstat set rootdev $rootstat(dev) log "Root device: $rootdev" 2 diff --git a/webif/lib/browse.class b/webif/lib/browse.class index 9c664d4..dea3e2e 100644 --- a/webif/lib/browse.class +++ b/webif/lib/browse.class @@ -4,8 +4,6 @@ require system.class plugin if {![exists -proc class]} { package require oo } class dir {} -set _flatten [system pkginst flatten] - proc _addicon {img {hover ""} {class va}} { set icon "