diff --git a/CONTROL/control b/CONTROL/control
index 98f0c9d..35f1c96 100644
--- a/CONTROL/control
+++ b/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
diff --git a/webif/html/css/style.css b/webif/html/css/style.css
index 90f01a1..3f3c422 100644
--- a/webif/html/css/style.css
+++ b/webif/html/css/style.css
@@ -495,3 +495,9 @@ span.foldernum
border-bottom-left-radius: 1em;
}
+#tbdiskspace
+{
+ float: right;
+ padding-top: 1.2em;
+}
+
diff --git a/webif/include/diskspace.jim b/webif/include/diskspace.jim
index 9458dd9..63d8209 100755
--- a/webif/include/diskspace.jim
+++ b/webif/include/diskspace.jim
@@ -26,7 +26,7 @@ if {[file exists /opt/share/images/blue/345_2_14_ST_HDD_01.png]} {
}
puts "
-
@@ -34,11 +34,16 @@ puts "
-
-
+
Total space: [pretty_size $size]
Used: [pretty_size $used] ($perc%)
Free: [pretty_size $free] ($fperc%)
+"
+if {[system pkginst undelete]} {
+ set dbs [system dustbinsize]
+ puts "
Dustbin: [pretty_size $dbs]"
+}
+puts "
"
diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index d30a97a..ab546c0 100755
--- a/webif/lib/rsv.class
+++ b/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
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 637cd1e..2310171 100644
--- a/webif/lib/system.class
+++ b/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" }