Changeset 9182 for src/django_gheat

Timestamp:

May 12, 2011, 8:26:36 AM (14 years ago)

Author:

rick

Message:

Allow importing multiple files.

File:

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

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

@@ -100 +100 @@
 
 class Command(BaseCommand):
-  args = '<csvfile>[.gz]'
+  args = '<csvfile>[.gz] [csvfile2[.gz] [csvfile3[.gz] ...] '
   option_list = BaseCommand.option_list + (
     make_option('-m', '--meetrondje', dest='meetrondje', default=None),
@@ -110 +110 @@
 
   def handle(self, *args, **options):
-    try:
-      (csv_file,) = args
-    except ValueError:
+    if len(args) == 0:
       self.print_help(sys.argv[0],sys.argv[1])
       raise CommandError("Not all arguments are provided")
-    if not os.path.isfile(csv_file):
-      raise CommandError("csv file '%s' does not exists" % csv_file)
 
-    # Meetrondje from filename if needed
-    if options['meetrondje'] == None:
-      meetrondje = os.path.basename(csv_file).rstrip('.gz').rstrip('.csv') 
-    else:
-      meetrondje = options['meetrondje']
-    # Date from filename if needed
-    if options['datum'] == None:
-       datum = os.path.basename(csv_file).lstrip('ScanResult-').rstrip('.csv.gz')
-    else:
-       datum = options['datum']
-    try:
-       datum = datetime.datetime.strptime(datum,'%Y-%m-%d-%H%M%S')
-    except ValueError:
-      raise CommandError("Invalid date '%s'\n" % options['datum'])
+    for csv_file in args:
+      # Make sure to check files before we going to do importing at all
+      if not os.path.isfile(csv_file):
+        raise CommandError("csv file '%s' does not exists" % csv_file)
+      self.stdout.write("#INFO: Processing '%s'\n" % csv_file)
 
-    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))
+      # Meetrondje from filename if needed
+      if options['meetrondje'] == None:
+        meetrondje = os.path.basename(csv_file).rstrip('.gz').rstrip('.csv') 
+      else:
+        meetrondje = options['meetrondje']
+      # Date from filename if needed
+      if options['datum'] == None:
+         datum = os.path.basename(csv_file).lstrip('ScanResult-').rstrip('.csv.gz')
+      else:
+         datum = options['datum']
+      try:
+         datum = datetime.datetime.strptime(datum,'%Y-%m-%d-%H%M%S')
+      except ValueError:
+        raise CommandError("Invalid date '%s'\n" % options['datum'])
+
+      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))