From 79dadbec689a33b8ff9e7323ef13d8baa72b2c4c Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Thu, 22 Oct 2015 19:28:12 +0000
Subject: [PATCH] more disk attributes

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2519 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control             |  2 +-
 webif/include/menuicons.jim |  2 +-
 webif/lib/bin/diskattrs     | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index b76b2e5..2bd0275 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.5-3
+Version: 1.2.5-4
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.7),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,recmon(>=2.0.7)
diff --git a/webif/include/menuicons.jim b/webif/include/menuicons.jim
index f39ecfb..71f4140 100755
--- a/webif/include/menuicons.jim
+++ b/webif/include/menuicons.jim
@@ -75,7 +75,7 @@ if {[$settings notwitfeed] == 0} {
 
 puts {
 <script type="text/javascript" async=true
-    src='http://twitcker.com/ticker/HummyPkg.js?open=true&container=own-container&own-container=twitfeed&speed=3&count=5&background=cccccc'>
+    src='http://twitcker.com/ticker/HummyPkg.js?open=true&container=own-container&own-container=twitfeed&speed=10&count=6&background=cccccc'>
 </script>
 
 <div id=twitfeed
diff --git a/webif/lib/bin/diskattrs b/webif/lib/bin/diskattrs
index 4154969..d45bf6b 100755
--- a/webif/lib/bin/diskattrs
+++ b/webif/lib/bin/diskattrs
@@ -19,6 +19,18 @@ if {$line ne ""} {
 	$settings _tval_setting "SMART_status" $smart
 }
 
+# Extract disk model.
+foreach line [split [exec /mod/bin/smartctl -i $disk] "\n"] {
+	if {[string match "*Not in smartctl database*" $line]} continue
+	if {[string match "*: *" $line]} {
+		regsub -all -- {[[:space:]]+} $line " " line
+		lassign [split $line ":"] key val
+		if {$key ne "Device Model"} continue
+		$settings _tval_setting "SMART_model" [string trim $val]
+	}
+}
+
+# Extract disk attributes.
 foreach line [split [exec /mod/bin/smartctl -A -f brief $disk] "\n"] {
 	regsub -all -- {[[:space:]]+} $line " " line
 	regsub -all -- {^[[:space:]]+} $line "" line
@@ -31,7 +43,9 @@ foreach line [split [exec /mod/bin/smartctl -A -f brief $disk] "\n"] {
 puts "SMART: ($smart)"
 
 foreach a {
+    {4 "startstop"}
     {5 "realloc"}
+    {9 "hours"}
     {10 "spinretry"}
     {197 "pending"}
     {198 "offline"}