Changeset 9627

Timestamp:

Aug 30, 2011, 6:34:39 PM (13 years ago)

Author:

rick

Message:

Allow importing multiple times.

File:

• src/django_gheat/gheat/management/commands/import_datafile.py (modified) (3 diffs)

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

@@ -29 +29 @@
 logger.setLevel(logging.INFO)
 
-# Open files for reading
 def open_file(file):
- if file.endswith('.gz'):
-   return gzip.open(file,'rb')
- else:
-  return open(file,'rb')
-
-# Prefix/Suffix removal
+  """ Open files for reading, unzip if needed """
+  if file.endswith('.gz'):
+    return gzip.open(file,'rb')
+  else:
+   return open(file,'rb')
+
+
 valid_prefixes = ['DroidStumbler-', 'Kismet-','ScanResult-']
 def strip_prefix(filename):
+  """ Prefix removal """
   for prefix in valid_prefixes:
     if filename.startswith(prefix):
       filename = filename[len(prefix):]
   return filename
+
+
 valid_suffixes = ['.gz', '.gpsxml', '.netxml', '.csv', '.ns1']
 def strip_suffix(filename):
+  """ Suffix removal """
   for suffix in valid_suffixes:
     if filename.endswith(suffix):
       filename = filename[:-len(suffix)]
   return filename
+
+
 def strip_file(filename):
+  """ Prefix and suffix removal """
   return strip_suffix(strip_prefix(filename))
 
+
+#Kismet-20110805-15-37-30-1
+#ScanResult-2011-05-09-201117
+strptime_choices = ['%Y%m%d-%H-%M-%S-1', '%Y-%m-%d-%H%M%S']
+def process_date(datestr):
+  for strptime in strptime_choices:
+    try: return datetime.datetime.strptime(datestr,strptime)
+    except ValueError: pass
+  # Start nagging we cannot parse the entries
+  raise CommandError("Invalid date '%s', options: %s" % (datestr, strptime_options))
 
 def import_accespoints(ap_pool, counters):
@@ -146 +163 @@
 
   def handle(self, *args, **options):
-    if options['verbosity'] > 1:
+    if options['verbosity'] > 2:
       logger.setLevel(logging.DEBUG)
     if len(args) == 0:
@@ -167 +184 @@
 
     def get_date(filename):
-      def process_date(datestr):
-        try:
-           # Kismet-20110805-15-37-30-1
-           return datetime.datetime.strptime(datestr,'%Y%m%d-%H-%M-%S-1')
-        except ValueError:
-          raise CommandError("Invalid date '%s'" % datestr)
       if options['datum'] == None:
          datestr = strip_file(os.path.basename(filename))