From 20b2a7e2dc04f4563f8d27368f4b367fdf8680f5 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Fri, 4 Nov 2011 13:38:48 +0000
Subject: [PATCH] fix crop progress?

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@505 2a923420-c742-0410-a762-8d5b09965624
---
 var/mongoose/cgi-bin/browse/crop.jim          | 20 ++++++++--------
 var/mongoose/cgi-bin/browse/crop_progress.jim | 24 +++++++++++++++++++
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100755 var/mongoose/cgi-bin/browse/crop_progress.jim

diff --git a/var/mongoose/cgi-bin/browse/crop.jim b/var/mongoose/cgi-bin/browse/crop.jim
index 1fecacd6..7f8704d2 100755
--- a/var/mongoose/cgi-bin/browse/crop.jim
+++ b/var/mongoose/cgi-bin/browse/crop.jim
@@ -108,7 +108,9 @@ puts {
 <div id=progressdiv style="display: none">
 Cropping: <div id=progressbar></div>
 }
-puts "<button id=back dir=\"[cgi_quote_url $dir]\"
+puts "<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
     style=\"display: none\">Back to media list</button>"
 puts {
 <div id=output class=pre style="margin-top: 10px"></div>
@@ -117,16 +119,14 @@ puts {
 <script type=text/javascript>
 
 var handle = 0;
-var pct = 0;
 
 function update()
 {
-	$('#progressbar').reportprogress(++pct);
-	if (pct == 100)
-	{
-		clearInterval(handle);
-		pct = 0;
-	}
+	$.get('/cgi-bin/browse/crop_progress.jim?file='
+	    + $('#back').attr('rfile'), function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
 }
 
 $(document).ready(function() {
@@ -142,10 +142,10 @@ $('#cropit').button().click(function() {
 	$('#progressdiv').show('slow');
 	handle = setInterval("update()", 100);
 	$('#output').load(document.URL + '&do=it', function() {
-		$('#progressbar').reportprogress(100);
 		clearInterval(handle);
-		pct = 0;
+		handle = 0;
 		$('#back').show();
+		$('#progressbar').reportprogress(100);
 	});
 });
 
diff --git a/var/mongoose/cgi-bin/browse/crop_progress.jim b/var/mongoose/cgi-bin/browse/crop_progress.jim
new file mode 100755
index 00000000..2dcdf21b
--- /dev/null
+++ b/var/mongoose/cgi-bin/browse/crop_progress.jim
@@ -0,0 +1,24 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set tsfile [cgi_get file]
+set rfile [file normalize $tsfile]
+set nfile [file rootname $rfile]
+
+if {![file exists "$rfile.decrypting"]} {
+	puts "0"
+} else {
+	set sz [file size $rfile]
+	set nsz [file size $nfile]
+
+	puts [expr $nsz * 100 / $sz]
+}
+