Changeset 9173 for src/django_gheat

Timestamp:

May 10, 2011, 1:44:07 PM (14 years ago)

Author:

rick

Message:

Allow compressed kismet files as well as input.

File:

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

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

@@ -9 +9 @@
 from lxml import etree
 import datetime
+import gzip
 import os
 import sys
 
 def import_file(gpsxml_file, netxml_file, meetrondje, gebruiker, email):
-  gpsxml_doc = etree.parse(gpsxml_file)
-  netxml_doc = etree.parse(netxml_file)
+  open_file = lambda file: gzip.open(file,'rb') if file.endswith('.gz') else open(file,'rb')
+  gpsxml_doc = etree.parse(open_file(gpsxml_file))
+  netxml_doc = etree.parse(open_file(netxml_file))
 
   points = gpsxml_doc.findall('gps-point')
@@ -87 +89 @@
 
 class Command(BaseCommand):
-  args = '<gpsxml> [<netxml>]'
+  args = '<gpsxml>[.gz] [<netxml>[.gz]]'
   option_list = BaseCommand.option_list + (
     make_option('-m', '--meetrondje', dest='meetrondje', default='rondje',help='Naam van het meetrondje'),
@@ -100 +102 @@
       elif len(args) == 1:
         (gpsxml_file,) = args
-        netxml_file = gpsxml_file[:-6] + 'netxml'
+        netxml_file = gpsxml_file.replace('.gpsxml','.netxml')
       else:
         raise ValueError