Changeset 9180

Timestamp:

May 12, 2011, 7:51:59 AM (14 years ago)

Author:

rick

Message:

Makes it visually more attractive

File:

• src/django_gheat/gheat/management/commands/import_droidstumbler.py (modified) (5 diffs)

src/django_gheat/gheat/management/commands/import_droidstumbler.py

@@ -31 +31 @@
 
 def import_droidstumbler(location, meetrondje, gebruiker, email, datum,show_progres=False):
-
+  """ Import all points, return tuple with summary"""
   g, created = Gebruiker.objects.get_or_create(naam=gebruiker , email=email)
   a, created = Apparatuur.objects.get_or_create(antenne='buildin' , kaart='mobilePhone')
   mr, created = MeetRondje.objects.get_or_create(datum=datum , naam=meetrondje , gebruiker=g , apparatuur=a)
 
+  meting_count = 0
+  new_ap_count = 0
   ap_cache = {}
   meting_pool = {}
@@ -54 +56 @@
       if not ap_cache.has_key(bssid):
         ap_cache[bssid], created = Accespoint.objects.get_or_create(mac=bssid, ssid=ssid, encryptie=capabilities)
+        if created: new_ap_count += 1
 
       # We store the best value found
@@ -65 +68 @@
 
   # Import the data into the database
-  count = 0
+  meting_count = 0
   for (ap,lat,lon),signal in meting_pool.iteritems():
     try:
@@ -75 +78 @@
     # Give some feedback to the user
     if show_progres:
-      count = user_feedback(count, 100, 1000)
+      meting_count = user_feedback(meting_count, 100, 1000)
 
   if show_progres:
-    sys.stdout.write("%s\n" % count)
+    sys.stdout.write("%s\n" % meting_count)
+
+  return (len(ap_cache), new_ap_count, meting_count, len(meting_pool) - meting_count)
 
 
@@ -113 +118 @@
        datum = datetime.datetime.strptime(datum,'%Y-%m-%d-%H%M%S')
     except ValueError:
-      logging.error("Invalid date '%s'" % options['datum'])
-      sys.exit(1)
+      raise CommandError("Invalid date '%s'\n" % options['datum'])
 
-    self.stdout.write('Meetrondje: %s @ %s\n' % (meetrondje, datum))
-    self.stdout.write("Going to import '%s' for gebruiker '%s <%s>'\n" % (os.path.basename(csv_file), options['gebruiker'], options['email']))
-    import_droidstumbler(csv_file,meetrondje,options['gebruiker'],options['email'], datum, True)
-    self.stdout.write("All done, goodbye")
+    self.stdout.write('#INFO: Meetrondje: %s @ %s\n' % (meetrondje, datum))
+    self.stdout.write("#INFO: Going to import '%s' for gebruiker '%s <%s>'\n" % (os.path.basename(csv_file), options['gebruiker'], options['email']))
+    (ap_count, new_ap_count, meting_count, meting_error_count) = import_droidstumbler(csv_file,meetrondje,options['gebruiker'],options['email'], datum, True)
+    self.stdout.write("#INFO: Import summary accespoints: added:%s processed:%s\n" % (new_ap_count, ap_count))
+    self.stdout.write("#INFO: Import summary metingen: added:%s error:%s\n" % (meting_count, meting_error_count))