Allow wifiscanner to run smoothly in non-maemo systems

[wifihood] / wifimap / wifiscan.py

diff --git a/wifimap/wifiscan.py b/wifimap/wifiscan.py
index 2c28969..98c33ee 100644 (file)
--- a/wifimap/wifiscan.py
+++ b/wifimap/wifiscan.py
@@ -3,10 +3,14 @@ import osso
 
 import time
 
-import gps
+import config , db , gps
 
 import gobject
 
+import os
+
+conf = config.Configuration()
+
 class Scanner ( gps.GPSObject ) :
 
     def __init__ ( self , widget=None , ifname="wlan0" ) :
@@ -19,16 +23,20 @@ class Scanner ( gps.GPSObject ) :
         self.nfp = 0
         self.scanlist = None
         self.aplist = {}
+        self.db = db.database( os.path.join( conf.homedir , conf.dbname ) )
 
     def start ( self ) :
         osso_rpc = osso.Rpc(self.osso_context)
         scan_out = osso_rpc.rpc_run("org.javiplx.wifiscan", "/org/javiplx/wifiscan", "org.javiplx.wifiscan", "start")
+        self.db.open()
 
     def stop ( self ) :
         osso_rpc = osso.Rpc(self.osso_context)
         scan_out = osso_rpc.rpc_run("org.javiplx.wifiscan", "/org/javiplx/wifiscan", "org.javiplx.wifiscan", "stop")
+        self.db.close()
 
     def scan ( self ) :
+        timestamp = time.time()
         osso_rpc = osso.Rpc(self.osso_context)
         try :
             scan_out = osso_rpc.rpc_run("org.javiplx.wifiscan", "/org/javiplx/wifiscan", "org.javiplx.wifiscan", "scan", wait_reply = True)
@@ -46,22 +54,28 @@ class Scanner ( gps.GPSObject ) :
             out_str += " %s %s" % ( items[0] , items[1] )
             if self.scanlist :
                 self.scanlist.insert_at_cursor( "%s %5d\n" % ( items[0] , int(items[1]) ) )
+            stored = self.db.get( items[0] )
+            if stored :
+                max_rss = int(items[1])
+                if stored[0] > max_rss :
+                    max_rss = stored[0]
+                self.db.update( items[0] , max_rss , timestamp )
+            else :
+                self.db.add( items[0] , int(items[1]) , timestamp )
             self.aplist[ items[0] ] = 1
         self.refresh_infowin()
         if self._debug :
-        # Use osso or hildon for notes ???
             osso.SystemNote(self.osso_context).system_note_infoprint("Found %d APs" % len(scan_out) )
-        #    hildon.hildon_banner_show_information( self._parent , "icon_path" , "Found %d APs" % len(scan_out) )
         else :
-            fd = open( "/home/user/MyDocs/wiscan_gui.info" , 'a' )
-            fd.write( "%s %s%s\n" % ( time.time() , self.gps_info , out_str ) )
+            fd = open( os.path.join( conf.homedir , "wiscan_gui.info" ) , 'a' )
+            fd.write( "%s %s%s\n" % ( timestamp , self.gps_info , out_str ) )
             fd.close()
             if self.satellites :
-                loclist = open( "/home/user/MyDocs/location.info" , 'a' )
+                loclist = open( os.path.join( conf.homedir , "location.info" ) , 'a' )
                 loclist.write ( "%s\n" % ( self.satellites ,) )
                 loclist.close()
             if self.cell_info :
-                celllist = open( "/home/user/MyDocs/cell.info" , 'a' )
+                celllist = open( os.path.join( conf.homedir , "cell.info" ) , 'a' )
                 celllist.write ( "%s\n" % ( self.cell_info ,) )
                 celllist.close()
 
@@ -73,7 +87,7 @@ class Scanner ( gps.GPSObject ) :
 
     def refresh_infowin ( self ) :
         if self.status :
-            self.status.set_text( "%d gps\t%d scan\t%d fp\t%d ap" % ( self.ngps , self.nscan , self.nfp , len(self.aplist.keys()) ) )
+            self.status.set_text( "%d gps\t%d scan\t%d fp\t%d ap\t%d total ap" % ( self.ngps , self.nscan , self.nfp , len(self.aplist.keys()) , self.db.nrows() ) )
 
 
 gobject.type_register(Scanner)