Changeset 9626

Timestamp:

Aug 30, 2011, 6:24:00 PM (13 years ago)

Author:

rick

Message:

strip replaces all characters.

File:

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

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

@@ -37 +37 @@
 
 # Prefix/Suffix removal
-valid_prefix = ['DroidStumbler-', 'Kismet-']
+valid_prefixes = ['DroidStumbler-', 'Kismet-','ScanResult-']
 def strip_prefix(filename):
-  for suffix in valid_suffixes:
-    filename = filename.rstrip(suffix)
+  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):
   for suffix in valid_suffixes:
-    filename = filename.rstrip(suffix)
+    if filename.endswith(suffix):
+      filename = filename[:-len(suffix)]
   return filename
 def strip_file(filename):
@@ -170 +172 @@
            return datetime.datetime.strptime(datestr,'%Y%m%d-%H-%M-%S-1')
         except ValueError:
-          raise CommandError("Invalid date '%s'" % options['datum'])
+          raise CommandError("Invalid date '%s'" % datestr)
       if options['datum'] == None:
          datestr = strip_file(os.path.basename(filename))