REFACTORING : move tstamp into real scanner object

[wifihood] / wifiscanner / wifimap / scanner.py

diff --git a/wifiscanner/wifimap/scanner.py b/wifiscanner/wifimap/scanner.py
index 423f203..5d4e21a 100644 (file)
--- a/wifiscanner/wifimap/scanner.py
+++ b/wifiscanner/wifimap/scanner.py
@@ -2,7 +2,7 @@
 try :
     import osso
 except :
-    import osso_wrapper as osso
+    import hildongtk.osso as osso
 
 import time
 
@@ -24,6 +24,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
         self.write = False
 
         # Values to be set by wireless scans
+        self.tstamp = 0
         self.newap = 0
         self.newaps = False
         self.aps = {}
@@ -42,6 +43,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
         self.write = False
 
     def scan ( self ) :
+        self.tstamp = time.time()
         wifiscan.WifiScanner.scan( self )
         newap = 0
         self.newaps = False
@@ -71,7 +73,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
 
     def write_logs ( self ) :
             fd = open( os.path.join( self.homedir , "wiscan_gui.info" ) , 'a' )
-            fd.write( "%s %s %s\n" % ( self.tstamp , " ".join(self.info) , " ".join(self.scanlist) ) )
+            fd.write( "%s %s\n" % ( self.tstamp , self ) )
             fd.close()
             if self.satellites :
                 loclist = open( os.path.join( self.homedir , "location.info" ) , 'a' )
@@ -82,6 +84,9 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
                 celllist.write ( "%s\n" % ( self.cells ,) )
                 celllist.close()
 
+    def __str__ ( self ) :
+        return "%s %s" % ( gps.GPSObject.__str__(self) , wifiscan.WifiScanner.__str__(self) )
+
     def report ( self ) :
         # BUG : if report is called after close, db.nrows() will produce an exception
         return "%s\t%s\t%d ap\t%d total ap" % ( gps.GPSObject.report(self) , wifiscan.WifiScanner.report(self) , self.newap , self.db.nrows() )