Merge pull request #9 from Meisterschueler/dev

Cleanup

README.md

@@ -78,7 +78,7 @@ The task server must be running for `db.updateddb`.
 - [x] Document/Improve cli commands
 - [ ] Separate settings from module (currently at ogn/command/dbutils.py)
 - [ ] Enable granular data acquisition (eg. store receiver beacons only)
-- [ ] Future Database-Migrations: Use Alembric?
+- [ ] Future Database-Migrations: Use Alembic?
   - [ ] Rename 'Flarm' to 'Device'?
   - [ ] Rename self.heared\_aircraft\_IDs (lowercase) in aircraft\_beacon
   - [ ] Rename self.heared\_aircraft\_IDs

ogn/collect/fetchddb.py

@@ -25,7 +25,7 @@ def update_ddb_data():
 
 
 @app.task
-def import_ddb_data(filename='custom.txt'):
+def import_ddb_data(filename='custom_ddb.txt'):
     logger.info("Import ddb data from file.")
 
     devices = get_ddb(filename)

ogn/collect/logbook.py

@@ -5,9 +5,9 @@ from datetime import datetime
 from celery.utils.log import get_task_logger
 from ogn.collect.celery import app
 
-from sqlalchemy.sql import func, null
+from sqlalchemy.sql import func
-from sqlalchemy import and_, or_, insert, between
+from sqlalchemy import and_, or_, insert
-from sqlalchemy.sql.expression import case, true, false, label
+from sqlalchemy.sql.expression import case
 
 from ogn.model import AircraftBeacon, TakeoffLanding
 

ogn/commands/logbook.py

@@ -3,8 +3,8 @@
 from datetime import timedelta
 
 from sqlalchemy.sql import func, null
-from sqlalchemy import and_, or_, insert, between
+from sqlalchemy import and_, or_, between
-from sqlalchemy.sql.expression import case, true, false, label
+from sqlalchemy.sql.expression import true, false, label
 
 from ogn.model import Flarm, TakeoffLanding
 

ogn/commands/showreceiver.py

@@ -3,8 +3,7 @@ from datetime import datetime, timedelta
 from sqlalchemy.sql import func
 from sqlalchemy import distinct, and_
 
-from ogn.model import ReceiverBeacon
+from ogn.model import ReceiverBeacon, ReceiverDevice
-from ogn.model.receiver_device import ReceiverDevice
 
 from ogn.commands.dbutils import session
 

ogn/custom_ddb.txt

@@ -0,0 +1,2 @@
+#DEVICE_TYPE,DEVICE_ID,AIRCRAFT_MODEL,REGISTRATION,CN,TRACKED,IDENTIFIED
+'F','DD0000','YourAircraft','D-1234','CN','Y','Y'