updates

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

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.17-2
+Version: 1.0.17-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.13),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(>=4.87),epg(>=1.0.13),hmt(>=1.1.21),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),mongoose

webif/html/css/style.css

@@ -495,3 +495,9 @@ span.foldernum
 	border-bottom-left-radius: 1em;
 }
 
+#tbdiskspace
+{
+	float: right;
+	padding-top: 1.2em;
+}
+

webif/include/diskspace.jim

@@ -26,7 +26,7 @@ if {[file exists /opt/share/images/blue/345_2_14_ST_HDD_01.png]} {
 }
 
 puts "
-	<span style=\"float: right; 
+	<span id=tbdiskpie style=\"float: right; 
 	    background:url('/images/345_1_27_ST_USB_BG.png')
 	    no-repeat\">
 		<a href=/diag/dspace/index.jim>
@@ -34,11 +34,16 @@ puts "
 		</a>
 	</span>
 
-	<span style=\"float: right\">
-		<br>
+	<span id=tbdiskspace>
 		Total space: [pretty_size $size]<br>
 		Used: [pretty_size $used] ($perc%)<br>
 		Free: [pretty_size $free] ($fperc%)
+"
+if {[system pkginst undelete]} {
+	set dbs [system dustbinsize]
+	puts "<br>Dustbin: [pretty_size $dbs]"
+}
+puts "
 	</span>
 "
 

webif/lib/rsv.class

@@ -60,11 +60,13 @@ require findhsvc
 if {![exists -proc binary]} { package require binary }
 
 rsv method aul {} {
-	if {[regexp -nocase {^[0-9a-f]+$} $aulEventToRecordInfo} {
-		set aulEventToRecordInfo [\
-		    binary format H* $aulEventToRecordInfo]
-	}
 	set aul {}
+	if {[regexp -nocase {^[0-9a-f]+$} $aulEventToRecordInfo} {
+		if {[catch {
+			set aulEventToRecordInfo [\
+			    binary format H* $aulEventToRecordInfo]
+		}]} return $aul
+	}
 	for {set i 0} {$i < [string length $aulEventToRecordInfo]} {incr i 16} {
 		binary scan [string range $aulEventToRecordInfo $i $($i + 15)] \
 		    iiii service start end event_id

webif/lib/system.class

@@ -160,6 +160,15 @@ proc {system dustbin} {{short 0}} {
 	return "[system mediaroot]/$dustbin"
 }
 
+proc {system dustbinsize} {} {
+	set bin [system dustbin]
+	set ret 0
+	if {[file isdirectory $bin]} {
+		lassign [exec /mod/bin/busybox/du -s $bin] ret
+	}
+	return $($ret * 1024)
+}
+
 proc {system diskpart} {} {
 	switch [system model] {
 		HDR { return "/mnt/hd2" }