From 1045587fbdc2ae3a510b9812c6d21897bd5cb6e3 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Tue, 6 Dec 2011 00:13:41 +0000
Subject: [PATCH] fix error on default browse directory

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@545 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                      |   2 +-
 var/mongoose/cgi-bin/browse.jim      |  64 ++++++++++++++++++++++--
 var/mongoose/cgi-bin/browse/join.jim |   1 +
 var/mongoose/html/img/sort_date.gif  | Bin 0 -> 609 bytes
 var/mongoose/html/img/sort_name.gif  | Bin 0 -> 384 bytes
 var/mongoose/html/js/touchbridge.js  |  70 +++++++++++++++++++++++++++
 var/mongoose/lib/settings.class      |   4 ++
 7 files changed, 136 insertions(+), 5 deletions(-)
 create mode 100644 var/mongoose/html/img/sort_date.gif
 create mode 100644 var/mongoose/html/img/sort_name.gif
 create mode 100644 var/mongoose/html/js/touchbridge.js

diff --git a/CONTROL/control b/CONTROL/control
index b6ad90b..2c519df 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.8.3
+Version: 0.8.3-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.1),ssmtp
diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim
index 04c90e0..ff8e380 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 system.class
+require ts.class pretty_size system.class settings.class
 
 puts "Content-Type: text/html"
 puts ""
@@ -18,6 +18,15 @@ cgi_input
 #set env(REQUEST_URI) ''
 #set _cgi(dir) "/media/My Video/\[Don't Die Young\]"
 
+if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
+
+set order [cgi_get order -]
+if {$order eq "-"} {
+	set order [[settings new] sortorder]
+} else {
+	[settings new] sortorder $order
+}
+
 proc directory {file bfile} {
 	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
@@ -192,7 +201,7 @@ puts {
 		<tr style="display: none" class=tstype>
 		<th>
 			<label for="renametitle" style="padding-top: 0.5em">
-				<b>New EPG Title</b>
+				<b>New Medialist Title</b>
 			</label>
 		</th>
 		<td>
@@ -274,12 +283,59 @@ regsub -all -- {\/+} "$dir/*" "/" dir
 # Escape square brackets (for glob)
 regsub -all {([\\[])} $dir {\\\1} dir
 
-foreach file [lsort [glob -nocomplain "$dir"]] {
-	entry $file
+proc s_time {a b} {
+	set ad [file isdirectory $a]
+	set bd [file isdirectory $b]
+
+	if {$ad && !$bd} { return -1 }
+	if {$bd && !$ad} { return 1 }
+	if {$ad && $bd} {
+		if {$a < $b} { return -1 }
+		if {$a > $b} { return 1 }
+		return 0
+	}
+
+	file stat $a l
+	set at $l(ctime)
+	file stat $b l
+	set bt $l(ctime)
+
+	if {$at < $bt} { return -1 }
+	if {$at > $bt} { return 1 }
+	return 0
 }
 
+set files [glob -nocomplain $dir]
+switch $order {
+	1 {		set files [lsort -command s_time $files] }
+	default {	set files [lsort $files] }
+}
+
+foreach file $files { entry $file }
+
 puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
 
+# Sort icons
+puts "<div id=sortdiv>"
+set sortlist {{0 sort_name name} {1 sort_date date}}
+foreach sl $sortlist {
+	lassign $sl index img descr
+
+	if {$index} { puts "  |  " }
+
+	set tag "Currently sorting"
+	if {$order != $index} {
+		puts "
+		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
+		set tag "Sort"
+	}
+	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"
+	if {$order != $index} {
+		puts "</a>"
+	}
+}
+puts "</div>"
+
 puts "</fieldset>"
 
 puts "<div class=brow>"
diff --git a/var/mongoose/cgi-bin/browse/join.jim b/var/mongoose/cgi-bin/browse/join.jim
index f335160..74705de 100755
--- a/var/mongoose/cgi-bin/browse/join.jim
+++ b/var/mongoose/cgi-bin/browse/join.jim
@@ -21,6 +21,7 @@ span.pl { padding-left: 2em; }
 
 <link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
 <script type="text/javascript" src="/js/jquery.progressbar.js"></script>
+<script type="text/javascript" src="/js/touchbridge.js"></script>
 
 <p><b>
 Drag the files below into order, enter a name for the resulting file and then
diff --git a/var/mongoose/html/img/sort_date.gif b/var/mongoose/html/img/sort_date.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7600325c47cdbbda5da16890a047e9b8006bdba2
GIT binary patch
literal 609
zcmZ?wbhEHb6krfwc;?CQ|NsB0_Q~qTcBPHIYDRW{{{H{|``@>p|7tp>GRXBys2Vba
zo|RBBD6Z?O?wt1K!`GjG{%e{#XlQGhJNc&NS5>u5UU%$jUPW_qZu#6R|382I`RV&F
z18cWmzyH2?_vyozA5FcpocyA{{`mF%&;NzD{+rl)7F4yT7F1;v*Htu6tZ1Dqp<?)7
zgrTZ!(z{RJvP&Bol&3OSu4|t-qqMP~L8kY|uixF%7q32b`@ams<(oIw?m6*ag5fXF
z(ZUQDu3h{8|KG$pD^(5cu3o>^H*0CnjK%*27_MBqdhx-d3-=!ZRWS^Dp!k!8k%7UJ
zK?megP@FKZ?`!aEYW8$?Xz6G%V_<OURN!D_6xHnM(G;D;p`bf$n*F?Ky37o+4BSF0
zl9DPy+)Ejlc^OO@3=KF<OgIe;w=nRkF(@$@x!HNRTRIsXW>6DnkYeRyu+gy)W8h<z
zVi4D7kQdNmaAmN*r6nNGps&H8$7al+V{2~3V9ch+prOtnC!-*mb)b=*!7qW~L83DU
zo3@BX#6g84Z2Sxc0UWFeM>zUKEL;Q>8XN@tSvV&298e78bW;^NImf^;O@YB007wV0
A&;S4c

literal 0
HcmV?d00001

diff --git a/var/mongoose/html/img/sort_name.gif b/var/mongoose/html/img/sort_name.gif
new file mode 100644
index 0000000000000000000000000000000000000000..128b347362c2e4e46d6c9ddd6b1909c11b8a7ebf
GIT binary patch
literal 384
zcmZ?wbhEHb6krfwxT??a|NsAAzyJRD_51zj?<Zv$K7Rf2<=fA<AHThP|9K_@!+&Fj
zZ$ExjwNF+zwo@~*%d2Sq@a4z5Pv24ts=ogCRZ!J#VC~k_JL})S|HXA(eY2KUwN2JE
zbuh8_OwKLOE^U1A?o(-FZ&ll*jN-bN@4uKk`KIMpz5ej!)%(wHK79TB^=D1T)QaYb
z-P0GV8rt>DSPXOw1BpQKCkrD3gFb@}NFT^g3~X}`OfUFxDy73iiJPH7RacA6d2^Cc
zxYWv1LYt!W#r2I@m{`uWY>wh(NMvAQbd+0voKb=+VN-yB2sbxNJ-0A}2tR`+8%qyc
zKN}aDCIi15g8(b%EY`VPa|IaWlo$k=m#<)1A;_R4#Gt{xX*1_mb`1t0Sq6EIed=mz
q>ian48Dv$H7?hPysftST^784%@$p@f7WI_zk@0+>qVm9z!5RP<D277-

literal 0
HcmV?d00001

diff --git a/var/mongoose/html/js/touchbridge.js b/var/mongoose/html/js/touchbridge.js
new file mode 100644
index 0000000..027d1ad
--- /dev/null
+++ b/var/mongoose/html/js/touchbridge.js
@@ -0,0 +1,70 @@
+/*
+ * Content-Type:text/javascript
+ *
+ * A bridge between iPad and iPhone touch events and jquery draggable, 
+ * sortable etc. mouse interactions.
+ * @author Oleg Slobodskoi  
+ * 
+ * modified by John Hardy to use with any touch device
+ * fixed breakage caused by jquery.ui so that mouseHandled internal flag is reset 
+ * before each touchStart event
+ * 
+ */
+(function( $ ) {
+
+    $.support.touch = typeof Touch === 'object';
+
+    if (!$.support.touch) {
+        return;
+    }
+
+    var proto =  $.ui.mouse.prototype,
+    _mouseInit = proto._mouseInit;
+
+    $.extend( proto, {
+        _mouseInit: function() {
+            this.element
+            .bind( "touchstart." + this.widgetName, $.proxy( this, "_touchStart" ) );
+            _mouseInit.apply( this, arguments );
+        },
+
+        _touchStart: function( event ) {
+            if ( event.originalEvent.targetTouches.length != 1 ) {
+                return false;
+            }
+
+            this.element
+            .bind( "touchmove." + this.widgetName, $.proxy( this, "_touchMove" ) )
+            .bind( "touchend." + this.widgetName, $.proxy( this, "_touchEnd" ) );
+
+            this._modifyEvent( event );
+
+            $( document ).trigger($.Event("mouseup")); //reset mouseHandled flag in ui.mouse
+            this._mouseDown( event );
+
+            return false;           
+        },
+
+        _touchMove: function( event ) {
+            this._modifyEvent( event );
+            this._mouseMove( event );   
+        },
+
+        _touchEnd: function( event ) {
+            this.element
+            .unbind( "touchmove." + this.widgetName )
+            .unbind( "touchend." + this.widgetName );
+            this._mouseUp( event ); 
+        },
+
+        _modifyEvent: function( event ) {
+            event.which = 1;
+            var target = event.originalEvent.targetTouches[0];
+            event.pageX = target.clientX;
+            event.pageY = target.clientY;
+        }
+
+    });
+
+})( jQuery );
+
diff --git a/var/mongoose/lib/settings.class b/var/mongoose/lib/settings.class
index bf3b194..232a631 100644
--- a/var/mongoose/lib/settings.class
+++ b/var/mongoose/lib/settings.class
@@ -116,6 +116,10 @@ settings method pkgdev {{val -1}} {
 	return [$self _nval_setting pkgdev $val]
 }
 
+settings method sortorder {{val -1}} {
+	return [$self _nval_setting sortorder $val]
+}
+
 settings method channel_groups {} {
 	set ret ""
 	set db [sqlite3.open /var/lib/humaxtv/setup.db]