add resume

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1932 2a923420-c742-0410-a762-8d5b09965624

CONTROL/control

@@ -1,11 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.14
+Version: 1.0.14-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),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),mongoose
-Conflicts: tvdiary(<0.0.2-6)
+Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.19),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),mongoose
 Suggests:
-Description: An evolving web interface for the Humax. [Enhance auto-expiry options]
+Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/5031/

webif/html/browse/file.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require pretty_size
+require pretty_size progressbar
 
 httpheader
 
@@ -79,6 +79,11 @@ if {$type eq "ts"} {
 	<td>[$ts duration] minute(s).
 	    <font class=also>(Scheduled: [expr [$ts get scheddur] / 60])
 	    </font></td>
+</tr><tr>
+	<th>Resumes</th>
+	<td>[$ts get resume] seconds into recording.
+	    [progressbar $([$ts get resume] * 100 / [$ts duration 1])]
+	</td>
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>

webif/lib/ts.class

@@ -25,6 +25,7 @@ class ts {
 	schedstart	0
 	scheddur	0
 	genre		0
+	resume		0
 }
 
 ts method duration {{raw 0}} {
@@ -43,7 +44,7 @@ ts method _parse {line} {
 	lassign [split $line "\t"] \
 	    title synopsis definition channel_num channel_name \
 	    start end flags_list guidance bookmarks schedstart scheddur \
-	    genre
+	    genre resume
 
 	set flags [split [string range $flags_list 0 end-1] ,]
 }