update

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

CONTROL/control

@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.0-5
+Version: 1.2.0-6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.14),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(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=1.2.0),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),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,mongoose
+Depends: webif-channelicons(>=1.1.14),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(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.0),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),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,mongoose,recmon(>=2.0.2)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/5866/

etc/recmon.d/webiflog

@@ -0,0 +1,24 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require ts.class system.class
+
+set file [lindex $argv 0]
+set ts [ts fetch "$file.ts"]
+set root [system mediaroot]
+
+set dir [file dirname $file]
+if {[string match "$root*" $dir]} {
+	set dir [string range $dir $([string length $root] + 1) end]
+}
+set ch [$ts get channel_name]
+set dur [$ts duration]
+set title [$ts get title]
+
+set msg "Recorded: $dir/$title ($dur minutes - $ch)"
+set logfd [open "/mod/tmp/record.log" "a+"]
+puts $logfd "[\
+    clock format [clock seconds] -format "%d/%m/%Y %H:%M"\
+    ] - $msg"
+$logfd close
+

webif/html/browse/file.jim

@@ -89,6 +89,9 @@ if {$type eq "ts"} {
 	<td>[$ts duration] minute(s).
 	    <font class=also>(Scheduled: [expr [$ts get scheddur] / 60])
 	    </font></td>
+</tr><tr>
+	<th>Status</th>
+	<td>[$ts get status]</td>
 </tr><tr>
 	<th>Resumes</th>
 	<td>[expr [$ts get resume] / 60] minutes into recording.

webif/html/browse/index.jim

@@ -117,7 +117,11 @@ proc entry {file} {{i 0}} {
 	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
 		set type ts
 		set ts [ts fetch $file 1]
-		set img Video_TS
+		if {[$ts get status] eq "Valid/OK"} {
+			set img Video_TS
+		} else {
+			set img Video_Failed
+		}
 		set omenu opt
 		if {[file exists "${base}.thm"]} { set thmok 1 }
 	} elseif {$ext eq ".hmt"} {

webif/lib/system.class

@@ -134,6 +134,14 @@ proc {system mediaroot} {} {
 	return ""
 }
 
+proc {system dlnadb} {} {
+	switch [system model] {
+		HDR { return "/mnt/hd2/dms_cds.db" }
+		HD { return "/media/drive1/dms_cds.db" }
+	}
+	return ""
+}
+
 proc {system dustbin} {{short 0}} {
 	set dustbin "\[Deleted Items\]"
 	if {![catch {set fd [open "/mod/boot/dustbin.name" r]}]} {

webif/lib/ts.class

@@ -26,6 +26,7 @@ class ts {
 	scheddur	0
 	genre		0
 	resume		0
+	status		""
 }
 
 ts method bfile {} {
@@ -52,7 +53,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 resume
+	    genre resume status
 
 	set flags [split [string range $flags_list 0 end-1] ,]
 }