Cleanup

ogn/__init__.py

@@ -1 +0,0 @@
-

ogn/commands/database.py

@@ -19,4 +19,4 @@ def updateddb():
     print("Updating ddb data...")
     result = update_ddb_data.delay()
     counter = result.get()
-    print("Imported %i devieces."%counter)
+    print("Imported %i devices." % counter)

ogn/commands/showreceiver.py

@@ -16,7 +16,7 @@ manager = Manager()
 
 
 @manager.command
-def list():
+def list_all():
     """Show a list of all receivers."""
     sq = session.query(distinct(ReceiverBeacon.name).label('name'), func.max(ReceiverBeacon.timestamp).label('lastseen'), func.count(ReceiverBeacon.name).label('messages_count')).\
         filter(ReceiverBeacon.timestamp > back_24h).\

ogn/gateway/__init__.py

@@ -11,6 +11,7 @@ from ogn.model import Base
 
 MODULE_VERSION = "0.1"
 
+
 class ognGateway:
     def __init__(self):
         pass
@@ -30,7 +31,6 @@ class ognGateway:
         self.sock.send(login.encode())
         self.sock_file = self.sock.makefile('rw')
 
-
     def run(self):
         keepalive_time = time()
         while True:

ogn/gateway/manage.py

@@ -5,6 +5,7 @@ DB_URI = 'sqlite:///beacons.db'
 from manager import Manager
 manager = Manager()
 
+
 @manager.command
 def run(aprs_user="anon-dev"):
     """Run the aprs client."""

tests/__init__.py

@@ -1 +0,0 @@
-

tests/model/__init__.py

@@ -1 +0,0 @@
-

tests/model/test_aircraft_beacon.py

@@ -1,8 +1,7 @@
 import unittest
 
 from ogn.aprs_utils import ms2fpm
-from ogn.model.beacon import Beacon
+from ogn.model import Beacon, AircraftBeacon
-from ogn.model.aircraft_beacon import AircraftBeacon
 
 
 class TestStringMethods(unittest.TestCase):

tests/model/test_beacon.py

@@ -1,7 +1,7 @@
 import unittest
 
 from ogn.aprs_utils import dmsToDeg, kts2kmh, m2feet
-from ogn.model.beacon import Beacon
+from ogn.model import Beacon
 
 
 class TestStringMethods(unittest.TestCase):

tests/model/test_receiver_beacon.py

@@ -1,6 +1,6 @@
 import unittest
 
-from ogn.model.receiver_beacon import ReceiverBeacon
+from ogn.model import ReceiverBeacon
 
 
 class TestStringMethods(unittest.TestCase):