REFACTORING : move tstamp into real scanner object

[wifihood] / wifiscanner / wifimap / wifiscan.py

diff --git a/wifiscanner/wifimap/wifiscan.py b/wifiscanner/wifimap/wifiscan.py
index 7edc380..f2a59ba 100644 (file)
--- a/wifiscanner/wifimap/wifiscan.py
+++ b/wifiscanner/wifimap/wifiscan.py
@@ -21,7 +21,6 @@ class WifiScanner ( gobject.GObject ) :
 
         # Values to be set by wireless scans
         self.scanlist = {}
-        self.tstamp = 0
         self.nscan = 0
         self.nfp = 0
 
@@ -44,7 +43,6 @@ class WifiScanner ( gobject.GObject ) :
             # BUG : if scan is called after stop (maybe in other cases), 'ERROR' is returned and split raises exception
             self.nscan +=1
             self.scanlist.clear()
-            self.tstamp = time.time()
             for net in scan_out.split() :
                 self.nfp += 1
                 items = net.rsplit(":", 1)
@@ -52,6 +50,10 @@ class WifiScanner ( gobject.GObject ) :
         except Exception , ex :
             osso.SystemNote(self.osso_context).system_note_infoprint("Exception scanning %s" % ex )
 
+    def __str__ ( self ) :
+        output = map( lambda x : "%s %s" % x , self.scanlist.iteritems() )
+        return " ".join( output )
+
     def report ( self ) :
         return "%d scan\t%d fp" % ( self.nscan , self.nfp )
 
@@ -65,7 +67,6 @@ if __name__ == "__main__" :
     def show_scan(sample):
         gobject.timeout_add( 5000 , show_scan , sample )
         print "scan results : %s" % sample.report()
-        print "  tstamp %s" % sample.tstamp
         c = 0
         for k,v in sample.scanlist.iteritems() :
            c += 1