From f550931f715f4d9563673f6715469f4c1298034f Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Fri, 18 Jan 2013 18:47:14 +0000
Subject: [PATCH] cleanup directory flag functions. No refresh on flag change

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1356 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                              |   4 +-
 var/mongoose/cgi-bin/browse.jim              |   2 +
 var/mongoose/cgi-bin/browse/assets.jim       |   9 +-
 var/mongoose/cgi-bin/browse/browse.js        | 109 ++++++++++---------
 var/mongoose/cgi-bin/browse/iconset.jim      |  15 +++
 var/mongoose/cgi-bin/channel.jim             |   1 +
 var/mongoose/html/css/jquery.contextMenu.css |   2 +
 var/mongoose/html/img/FreeviewHD.png         | Bin 0 -> 9017 bytes
 var/mongoose/html/img/compressr.png          |   1 +
 var/mongoose/html/img/context/compressr.png  | Bin 0 -> 764 bytes
 var/mongoose/html/img/context/decryptr.png   | Bin 0 -> 674 bytes
 var/mongoose/html/img/decryptr.png           |   1 +
 var/mongoose/html/lib/topbar.jim             |   5 +-
 var/mongoose/lib/browse.class                |  29 ++++-
 14 files changed, 116 insertions(+), 62 deletions(-)
 create mode 100755 var/mongoose/cgi-bin/browse/iconset.jim
 create mode 100644 var/mongoose/html/img/FreeviewHD.png
 create mode 120000 var/mongoose/html/img/compressr.png
 create mode 100644 var/mongoose/html/img/context/compressr.png
 create mode 100644 var/mongoose/html/img/context/decryptr.png
 create mode 120000 var/mongoose/html/img/decryptr.png

diff --git a/CONTROL/control b/CONTROL/control
index 2689ce7..f7ec8bf 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.10.2-2
+Version: 0.11.0
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.0.3),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.5),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.9-1),hmt(>=1.1.10),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.04)
+Depends: webif-channelicons(>=1.0.4),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.6),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.9-1),hmt(>=1.1.10),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05)
 Suggests: ffmpeg
 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 51c7d2d..f7a7b0a 100755
--- a/var/mongoose/cgi-bin/browse.jim
+++ b/var/mongoose/cgi-bin/browse.jim
@@ -55,7 +55,9 @@ proc directory {file bfile tbfile} {
 
 	lassign [{dir iconset} $file] icons attrs
 
+	puts "<span class=iconset>"
 	puts [join $icons ""]
+	puts "</span>"
 
 	puts -nonewline "
 	      <a href=#>
diff --git a/var/mongoose/cgi-bin/browse/assets.jim b/var/mongoose/cgi-bin/browse/assets.jim
index 67aec5d..4f1e452 100755
--- a/var/mongoose/cgi-bin/browse/assets.jim
+++ b/var/mongoose/cgi-bin/browse/assets.jim
@@ -45,7 +45,7 @@ puts {
 	<li><a href=#download>Download</a></li>
 </ul>
 
-<ul id=doptmenu class=contextMenu style="width: 180px">
+<ul id=doptmenu class=contextMenu style="width: 250px">
 	<li class=delete><a href=#delete>Delete</a></li>
 	<li class=cut><a href=#cut>Cut to clipboard</a></li>
 	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
@@ -53,10 +53,15 @@ puts {
 	<li class=separator><a href=#rename>Rename</a></li>
 	<li class=separator><a href=#resetnew>Reset new flag</a></li>
 	<li class="separator compress"><a href=#shrink>Auto-Shrink</a></li>
+	<li class="compressr"><a href=#shrinkr>Recursive Auto-Shrink</a></li>
 	<li class=dedup><a href=#dedup>Auto-Dedup</a></li>
 }
 if {$model eq "HDR"} {
-	puts { <li class=decrypt><a href=#decrypt>Auto-Decrypt</a></li> }
+	puts {
+		<li class=decrypt><a href=#decrypt>Auto-Decrypt</a></li>
+		<li class=decryptr><a href=#decryptr>Recursive Auto-Decrypt
+		    </a></li>
+	}
 }
 if $flatten {
 	puts { <li class="separator"><a href=#flat>No-Flatten</a></li> }
diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js
index c720c2c..4e2c3f6 100755
--- a/var/mongoose/cgi-bin/browse/browse.js
+++ b/var/mongoose/cgi-bin/browse/browse.js
@@ -310,6 +310,36 @@ function preparemenu(el, menu)
 
 }
 
+function fixdmenu(el, menu, flag, tag, descr, recurse)
+{
+	var a = el.attr(flag);
+	var b = el.attr(flag + 'r');
+
+	if (a == undefined) a = 0;
+	if (b == undefined) b = 0;
+
+	if (a > 0)
+		$(menu).changeContextMenuItem(tag, 'Disable ' + descr);
+	else
+		$(menu).changeContextMenuItem(tag, 'Enable ' + descr);
+
+	if (recurse)
+	{
+		if (b > 0)
+		{
+			$(menu).changeContextMenuItem(tag + 'r',
+			    'Disable Recursive ' + descr);
+			$(menu).disableContextMenuItems(tag);
+		}
+		else
+		{
+			$(menu).changeContextMenuItem(tag + 'r',
+			    'Enable Recursive ' + descr);
+			$(menu).enableContextMenuItems(tag);
+		}
+	}
+}
+
 function preparedmenu(el, menu)
 {
 	if (el.attr('noflat') != undefined)
@@ -320,42 +350,11 @@ function preparedmenu(el, menu)
 			$(menu).changeContextMenuItem('#flat',
 			    'Prevent Flatten');
 	}
-	if (el.attr('autoshrink') != undefined)
-	{
-		if (el.attr('autoshrink') > 0)
-			$(menu).changeContextMenuItem('#shrink',
-			    'Disable Auto-shrink');
-		else
-			$(menu).changeContextMenuItem('#shrink',
-			    'Enable Auto-shrink');
-	}
-	if (el.attr('autodedup') != undefined)
-	{
-		if (el.attr('autodedup') > 0)
-			$(menu).changeContextMenuItem('#dedup',
-			    'Disable Auto-dedup');
-		else
-			$(menu).changeContextMenuItem('#dedup',
-			    'Enable Auto-dedup');
-	}
-	if (el.attr('autodecrypt') != undefined)
-	{
-		if (el.attr('autodecrypt') > 0)
-			$(menu).changeContextMenuItem('#decrypt',
-			    'Disable Auto-decrypt');
-		else
-			$(menu).changeContextMenuItem('#decrypt',
-			    'Enable Auto-decrypt');
-	}
-	if (el.attr('autompg') != undefined)
-	{
-		if (el.attr('autompg') > 0)
-			$(menu).changeContextMenuItem('#mpg',
-			    'Disable Auto-mpg');
-		else
-			$(menu).changeContextMenuItem('#mpg',
-			    'Enable Auto-mpg');
-	}
+
+	fixdmenu(el, menu, 'autoshrink', '#shrink', 'Auto-shrink', 1);
+	fixdmenu(el, menu, 'autodedup', '#dedup', 'Auto-dedup', 0);
+	fixdmenu(el, menu, 'autodecrypt', '#decrypt', 'Auto-decrypt', 1);
+	fixdmenu(el, menu, 'autompg', '#mpg', 'Auto-mpg', 0);
 }
 
 $(document).ready(function() {
@@ -462,10 +461,28 @@ var menuclick = function(action, el, pos)
 	}
 };
 
+function flagdir(file, flag, iconset, output, options)
+{
+	var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
+		    '&flag=' + flag;
+
+	$(output).load(url, function() {
+		$(iconset)
+		    .empty()
+		    .html('<img src=/img/loading.gif> Updating...')
+		    .load('/cgi-bin/browse/iconset.jim?file=' + file);
+		if ($(options).attr(flag) == '1')
+			$(options).attr(flag, 0);
+		else
+			$(options).attr(flag, 1);
+	}).delay(3000).slideUp();
+}
+
 var dmenuclick = function(action, el, pos)
 {
 	var direl = $(el).parent().parent();
 	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
+	var iconset = $(el).parent().prevAll('span.iconset').last();
 	var bfile = file.replace(/.*\//g, '');
 	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
 	var results = $(el).parent().next('div.results');
@@ -521,33 +538,23 @@ var dmenuclick = function(action, el, pos)
 		break;
 
 	    case 'flat':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=noflatten';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'noflatten', iconset, results, el);
 		break;
 
 	    case 'dedup':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autodedup';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autodedup', iconset, results, el);
 		break;
 
 	    case 'mpg':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autompg';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autompg', iconset, results, el);
 		break;
 
 	    case 'shrink':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autoshrink';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autoshrink', iconset, results, el);
 		break;
 
 	    case 'decrypt':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autodecrypt';
-		$.get(url, function() { window.location.reload(true); });
+		flagdir(file, 'autodecrypt', iconset, results, el);
 		break;
 
 	    case 'resetnew':
diff --git a/var/mongoose/cgi-bin/browse/iconset.jim b/var/mongoose/cgi-bin/browse/iconset.jim
new file mode 100755
index 0000000..bd974b5
--- /dev/null
+++ b/var/mongoose/cgi-bin/browse/iconset.jim
@@ -0,0 +1,15 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require browse.class
+
+puts "Content-Type: text/html"
+puts ""
+
+set file [cgi_get file]
+
+if {[file isdirectory $file]} {
+	lassign [{dir iconset} $file] icons #attrs
+	puts [join $icons ""]
+}
diff --git a/var/mongoose/cgi-bin/channel.jim b/var/mongoose/cgi-bin/channel.jim
index 0840b48..d10852b 100755
--- a/var/mongoose/cgi-bin/channel.jim
+++ b/var/mongoose/cgi-bin/channel.jim
@@ -71,6 +71,7 @@ foreach tw [$db query {
 		switch $name {
 			"BBC ONE" { set mux "PSB1/BBC A" }
 			"ITV1" { set mux "PSB2/D3&amp;4" }
+			"ITV" { set mux "PSB2/D3&amp;4" }
 			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
diff --git a/var/mongoose/html/css/jquery.contextMenu.css b/var/mongoose/html/css/jquery.contextMenu.css
index f4a2fff..7ab4f61 100644
--- a/var/mongoose/html/css/jquery.contextMenu.css
+++ b/var/mongoose/html/css/jquery.contextMenu.css
@@ -65,8 +65,10 @@
 .contextMenu LI.cut A { background-image: url(/img/context/cut.png); }
 .contextMenu LI.quit A { background-image: url(/img/context/door.png); }
 .contextMenu LI.compress A { background-image: url(/img/context/compress.png); }
+.contextMenu LI.compressr A { background-image: url(/img/context/compressr.png); }
 .contextMenu LI.dedup A { background-image: url(/img/context/dedup.png); }
 .contextMenu LI.decrypt A { background-image: url(/img/context/decrypt.png); }
+.contextMenu LI.decryptr A { background-image: url(/img/context/decryptr.png); }
 .contextMenu LI.mpg A { background-image: url(/img/context/mpg.png); }
 
 
diff --git a/var/mongoose/html/img/FreeviewHD.png b/var/mongoose/html/img/FreeviewHD.png
new file mode 100644
index 0000000000000000000000000000000000000000..b48305f1f046bc623b22948cd04d273bd32e4704
GIT binary patch
literal 9017
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

literal 0
HcmV?d00001

diff --git a/var/mongoose/html/img/compressr.png b/var/mongoose/html/img/compressr.png
new file mode 120000
index 0000000..fe6ed71
--- /dev/null
+++ b/var/mongoose/html/img/compressr.png
@@ -0,0 +1 @@
+context/compressr.png
\ No newline at end of file
diff --git a/var/mongoose/html/img/context/compressr.png b/var/mongoose/html/img/context/compressr.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f50b060b8b48b3d3152379b28d6f600f2545c97
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oC35jRo7;`9Ij0*OgP
zK~y-)eUeK^lu;OlpEEbo#B3Zj=Fc!3QJF%l7ELaKq*ZiTB$(J{TvW6Yf&nc;sYoaU
zNyJbgf>zqX(H07mqnRM3AdyyhD}SAt6f&m~=klKxd7IL{-FeUXp7%Z9IbyUn9gn?-
zyc|WcOHEIF5Zl*MZXGpf7>MZ-U%Vgk?$*z7$LTou?B|be-~xb<QX+)d4<zi=T-)5P
z?xY7-f&xH{Kg#a}&hKLG&c8K&9iaK;fV#H2!t~q%^{xuV_4wKR20-Rrb%HSiHi8Nu
z;%DM{8~sPSg(>z!u7#HQG&x1Rt3r9$(muaA0|0IHCsB1Q&e~wk0^sC8E(P}@N>fL_
znsx91m36JE7Sn`WcQXLQ)>c@Y_QV0w_Lh)b(usRq(AK@Iu7#GFne$Qas!-ZqjUc54
zavdO}AuM_4;s7!lV(P1p%O~=0S}ZoDsr|Kj$eKoFU8^cJO-QLBC5Vv+xjhLc-PxTc
zIBLCvUau!9|I9yo3$rr<BmyvZk9}X-2@sxqLswT9RaI3yY3~D|D0?57IY(yReeoX#
z5F<4i9J}kc-f!u8y13+zyT`SQMO0T;V>X*9E-uDqv(eDdKvGf?<>lo#91bByYtrc}
z=%w;fff?BIcZ$ZwM%C?hlbV`JVqzkZNQ7`Wj9#y&w6v5>fEEl8@XsTJASF2&DP^mY
zp5i=Z&&1>L;PrY527@Syg3)Ni=ksAS8vne)#@_)jnN0jzT_qR_Ic?cC8aupz9+%6-
z;NT#`!@~pu0SXHXDJv`6N+5#)zRk^|)9C<+Mk8-^dV?bt3HLYLzHw#4$mw*dcDtRq
uXbM^^I>dj<0$736?P70luUyxxfaN#+pbKx(jaAwJ0000<MNUMnLSTYnDOIZg

literal 0
HcmV?d00001

diff --git a/var/mongoose/html/img/context/decryptr.png b/var/mongoose/html/img/context/decryptr.png
new file mode 100644
index 0000000000000000000000000000000000000000..4479559f3ab2b6b5d343f651daa310c305f41f78
GIT binary patch
literal 674
zcmV;T0$u%yP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oC34+%u#z<>Y%0xwBK
zK~y-)g_2K5R8bU%zkA<I&b%BKBTor8iIBLF><{HCaN}kc!&`(1(JCPkT()o{ZklW(
z2(?IIf<V^}6eu)Jp^yV5Aq7pVnM{0RGDC~kynnZil)ahqz}bBK__*hsEBHrcv)M~s
zU0oxd=TR<~UrtR;y=#>dVK6y4DNWOSY}@u7+qQ*LidZbBlF8(gjg5`Fb8~aS$-E2;
zQmNGR(b3U_ZQBov#iEhV=Z(F+z4=n9G+~<NG^bTAmn$tVFTV)$g@uLZg+iee=8-V)
zJg*PPhWYO9?t@CDa^qBilu{%T2`|i-mX-=Yp(!5*nx@g-rU2OA-_M*j@?Tf@R=lbF
zdYS4$gKE`7zx;@U{B1fqVi?^~y8F)YLk!Y?bzZa_L5n!Fx0g_M9oc}7l?qz_ea`#0
z=r9z?ZXdgT@joN{_9_$*kH=YGUq`$436ug9?>}F`vaFug0`<ovfPsMlYPA}fOomtA
zpYfskl(n@rW@l%=Zf$L;rX3vYq}AERYwFb+hgEPJ@YY`>m&?)F*@>>}xUP%iIB1&2
z*w|R}6#^xWTjDE?(a}*%(*(e>EOcGRFbo{WVP$2d)jv>35g-LfA+X<EU?c(8@9nU;
zxyknSHkM^EG&IEc_;~XR1PXydq7VefvVfk$K_*g*2q73A9%g1{M)daf3L&MG(P;Ec
zBoc|A=$NKyZBoi8KoA73@B0nU^M0<bu6{|U(@D?sY}a+2U!*1K3Fjn+dH?_b07*qo
IM6N<$f-^fbJpcdz

literal 0
HcmV?d00001

diff --git a/var/mongoose/html/img/decryptr.png b/var/mongoose/html/img/decryptr.png
new file mode 120000
index 0000000..9d57140
--- /dev/null
+++ b/var/mongoose/html/img/decryptr.png
@@ -0,0 +1 @@
+context/decryptr.png
\ No newline at end of file
diff --git a/var/mongoose/html/lib/topbar.jim b/var/mongoose/html/lib/topbar.jim
index 85126fe..9caa052 100644
--- a/var/mongoose/html/lib/topbar.jim
+++ b/var/mongoose/html/lib/topbar.jim
@@ -2,7 +2,9 @@ puts {
 <!-- start of topbar -->
 
 <div id=topbar class=container onclick="location.href='/'; return false;">
-	<div class=left><img src=/images/154_1_00_WIN_MD116_1L.png></div>
+	<div class=left>
+		<img src=/images/154_1_00_WIN_MD116_1L.png>
+	</div>
 	<div class=middle>
 <!-- Start include diskspace - above other items to work around IE feature.. -->
 }
@@ -10,6 +12,7 @@ source /mod/webif/include/diskspace.jim
 puts {
 <!-- End include diskspace -->
 		<img border=0 src=/images/516_1_26_Freeview_Logo.png>
+		<!-- <img border=0 height=47 src=/img/FreeviewHD.png> -->
 		<span style="display: inline; font-size: 150%;
 		    padding: 0 0 0 2em;">
 }
diff --git a/var/mongoose/lib/browse.class b/var/mongoose/lib/browse.class
index 93402a2..013198c 100644
--- a/var/mongoose/lib/browse.class
+++ b/var/mongoose/lib/browse.class
@@ -28,32 +28,49 @@ proc {dir iconset} {dir} {
 		lappend attrs "noflat=$noflat"
 	}
 
+	set autoshrinkr 0
+	if {[file exists "$dir/.autoshrinkr"]} {
+		set autoshrinkr 1
+		lappend icons [_addicon "/img/compressr.png" \
+		    "Recursive Auto-shrink"]
+		lappend attrs "autoshrinkr=1"
+	}
+
 	set autoshrink 0
-	if {[file exists "$dir/.autoshrink"]} {
+	if {!$autoshrinkr && [file exists "$dir/.autoshrink"]} {
 		set autoshrink 1
 		lappend icons [_addicon "/img/compress.png" "Auto-shrink"]
-		lappend attrs "autoshrink=$autoshrink"
+		lappend attrs "autoshrink=1"
 	}
 
+
 	set autodedup 0
 	if {[file exists "$dir/.autodedup"]} {
 		set autodedup 1
 		lappend icons [_addicon "/img/dedup.png" "Auto-dedup"]
-		lappend attrs "autodedup=$autodedup"
+		lappend attrs "autodedup=1"
+	}
+
+	set autodecryptr 0
+	if {[file exists "$dir/.autodecryptr"]} {
+		set autodecryptr 1
+		lappend icons [_addicon "/img/decryptr.png" \
+		    "Recursive Auto-decrypt"]
+		lappend attrs "autodecryptr=1"
 	}
 
 	set autodecrypt 0
-	if {[file exists "$dir/.autodecrypt"]} {
+	if {!$autodecryptr && [file exists "$dir/.autodecrypt"]} {
 		set autodecrypt 1
 		lappend icons [_addicon "/img/decrypt.png" "Auto-decrypt"]
-		lappend attrs "autodecrypt=$autodecrypt"
+		lappend attrs "autodecrypt=1"
 	}
 
 	set autompg 0
 	if {[file exists "$dir/.autompg"]} {
 		set autompg 1
 		lappend icons [_addicon "/img/mpg.png" "Auto-MPG Extract"]
-		lappend attrs "autompg=$autompg"
+		lappend attrs "autompg=1"
 	}
 
 	return [list $icons $attrs]