[svn] r4925 - in trunk/tools/dstat: . plugins

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-11-21 23:26:17 +0100 (Tue, 21 Nov 2006)
New Revision: 4925

Modified:
   trunk/tools/dstat/dstat
   trunk/tools/dstat/plugins/dstat_wifi.py
Log:
wifi plugin updates

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2006-11-21 22:13:03 UTC (rev 4924)
+++ trunk/tools/dstat/dstat	2006-11-21 22:26:17 UTC (rev 4925)
@@ -306,10 +306,10 @@
 			return self.title2()
 
 	def title1(self):
+		ret = ansi['darkblue']
 		if isinstance(self.name, types.StringType):
 			max = self.statwidth()
-			return ansi['darkblue'] + self.name[0:max].center(max).replace(' ', '-') + ansi['default']
-		ret = ansi['darkblue']
+			return ret + self.name[0:max].center(max).replace(' ', '-') + ansi['default']
 		for i, name in enumerate(self.name):
 			max = self.width()
 			ret = ret + name[0:max].center(max).replace(' ', '-')

Modified: trunk/tools/dstat/plugins/dstat_wifi.py
===================================================================
--- trunk/tools/dstat/plugins/dstat_wifi.py	2006-11-21 22:13:03 UTC (rev 4924)
+++ trunk/tools/dstat/plugins/dstat_wifi.py	2006-11-21 22:26:17 UTC (rev 4925)
@@ -1,19 +1,20 @@
 global iwlibs
-import iwlibs
+from pythonwifi import iwlibs
 
 class dstat_wifi(dstat):
 	def __init__(self):
 		self.name = 'wifi'
 		self.format = ('d', 3, 33)
+		self.check()
 		self.vars = iwlibs.getNICnames()
 		self.name = self.vars
 		self.nick = ('lnk', 's/n')
 		self.init(self.vars, 2)
 
 	def check(self): 
+		global iwlibs
 		try:
-			global iwlibs
-			import iwlibs
+			from pythonwifi import iwlibs
 		except:
 			raise Exception, 'Module needs the python-wifi module.'
 		return True
@@ -23,10 +24,9 @@
 			wifi = iwlibs.Wireless(name)
 			stat, qual, discard, missed_beacon = wifi.getStatistics()
 #			print qual.quality, qual.signallevel, qual.noiselevel
-			if qual.quality == 0 and qual.signallevel == qual.noiselevel == -101:
+			if qual.quality == 0 or qual.signallevel == -101 or qual.noiselevel == -101 or qual.signallevel == -256 or qual.noiselevel == -256:
 				self.val[name] = ( -1, -1 )
 			else:
-				self.val[name][0] = qual.quality * 100 / 160
-				self.val[name][1] = qual.signallevel * 100 / qual.noiselevel
+				self.val[name] = ( qual.quality, qual.signallevel * 100 / qual.noiselevel )
 
 # vim:ts=4:sw=4