From f0d22b3b01120e0870d6c056426f99405efe9737 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 11 Jun 2012 18:49:56 +0000 Subject: [PATCH] new strip version git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1052 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- var/mongoose/cgi-bin/browse/strip/analyse.jim | 16 ++++++++++++++++ var/mongoose/cgi-bin/browse/strip/strip.jim | 6 +++++- var/mongoose/cgi-bin/browse/strip/strip.js | 11 +++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100755 var/mongoose/cgi-bin/browse/strip/analyse.jim diff --git a/CONTROL/control b/CONTROL/control index 4b1be78..c5ea4e1 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.9.11 +Version: 0.9.11-1 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts +Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.0.1) Suggests: ffmpeg,webif-iphone Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/browse/strip/analyse.jim b/var/mongoose/cgi-bin/browse/strip/analyse.jim new file mode 100755 index 0000000..027301a --- /dev/null +++ b/var/mongoose/cgi-bin/browse/strip/analyse.jim @@ -0,0 +1,16 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/webif/lib/setup +require ts.class pretty_size + +puts "Content-Type: text/html\r\n\r\n" + +cgi_input +#cgi_dump + +set rfile [cgi_get file] +set base [file rootname $rfile] + +puts [exec /mod/bin/stripts -aq $base] + diff --git a/var/mongoose/cgi-bin/browse/strip/strip.jim b/var/mongoose/cgi-bin/browse/strip/strip.jim index 5ecb4aa..30ba123 100755 --- a/var/mongoose/cgi-bin/browse/strip/strip.jim +++ b/var/mongoose/cgi-bin/browse/strip/strip.jim @@ -39,6 +39,10 @@ Your original recording files will be retained in a folder called _original. Size:[pretty_size [$ts size]] ([$ts get definition]) Time: Stripping will take around [clock format $esttime -format "%T"] +Estimated Saving: + + Analysing file, please wait... + -
+ diff --git a/var/mongoose/cgi-bin/browse/strip/strip.js b/var/mongoose/cgi-bin/browse/strip/strip.js index 53b6e25..dd80f74 100755 --- a/var/mongoose/cgi-bin/browse/strip/strip.js +++ b/var/mongoose/cgi-bin/browse/strip/strip.js @@ -13,6 +13,17 @@ function update() $(document).ready(function() { +$('#analysis').load('analyse.jim?file=' + $('#params').attr('file'), + function(t) { + if ($.trim(t) == '0%') + { + $('#output').text('Recording is already stripped.'); + $('#back').slideDown(); + } + else + $('#stripdiv').slideDown(); + }); + $('#progressbar').reportprogress(0); $('#back').button().click(function() {