mirror
/
ogn-python
kopia lustrzana https://github.com/glidernet/ogn-python
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

flake8 refactoring

pull/68/head
Konstantin Gründger 2017-12-08 21:32:50 +01:00
rodzic ad05de59e8
commit 966b7d9c73
2 zmienionych plików z 70 dodań i 62 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
ogn/collect/database.py
Wyświetl plik

@ -65,7 +65,8 @@ def update_devices():
app.session.commit() app.session.commit()
# For each address in the new beacons: get firstseen, lastseen and last values != NULL # For each address in the new beacons: get firstseen, lastseen and last values != NULL
last_valid_values = app.session.query(distinct(AircraftBeacon.address).label('address'), last_valid_values = app.session.query(
distinct(AircraftBeacon.address).label('address'),
func.first_value(AircraftBeacon.timestamp) func.first_value(AircraftBeacon.timestamp)
.over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.timestamp == null(), None), (AircraftBeacon.timestamp != null(), AircraftBeacon.timestamp)])) .over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.timestamp == null(), None), (AircraftBeacon.timestamp != null(), AircraftBeacon.timestamp)]))
.label('firstseen'), .label('firstseen'),
@ -90,7 +91,8 @@ def update_devices():
.filter(and_(AircraftBeacon.device_id == null(), AircraftBeacon.error_count == 0)) \ .filter(and_(AircraftBeacon.device_id == null(), AircraftBeacon.error_count == 0)) \
.subquery() .subquery()
update_values = app.session.query(Device.address, update_values = app.session.query(
Device.address,
case([(or_(Device.firstseen == null(), Device.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen), case([(or_(Device.firstseen == null(), Device.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
(Device.firstseen <= last_valid_values.c.firstseen, Device.firstseen)]).label('firstseen'), (Device.firstseen <= last_valid_values.c.firstseen, Device.firstseen)]).label('firstseen'),
case([(or_(Device.lastseen == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen), case([(or_(Device.lastseen == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
@ -110,7 +112,8 @@ def update_devices():
update_receivers = app.session.query(Device) \ update_receivers = app.session.query(Device) \
.filter(Device.address == update_values.c.address) \ .filter(Device.address == update_values.c.address) \
.update({Device.firstseen: update_values.c.firstseen, .update({
Device.firstseen: update_values.c.firstseen,
Device.lastseen: update_values.c.lastseen, Device.lastseen: update_values.c.lastseen,
Device.aircraft_type: update_values.c.aircraft_type, Device.aircraft_type: update_values.c.aircraft_type,
Device.stealth: update_values.c.stealth, Device.stealth: update_values.c.stealth,
@ -123,7 +126,8 @@ def update_devices():
upd = app.session.query(AircraftBeacon) \ upd = app.session.query(AircraftBeacon) \
.filter(AircraftBeacon.device_id == null()) \ .filter(AircraftBeacon.device_id == null()) \
.filter(AircraftBeacon.address == Device.address) \ .filter(AircraftBeacon.address == Device.address) \
.update({AircraftBeacon.device_id: Device.id}, .update({
AircraftBeacon.device_id: Device.id},
synchronize_session='fetch') synchronize_session='fetch')
app.session.commit() app.session.commit()
@ -147,7 +151,8 @@ def update_receivers():
insert_count = res.rowcount insert_count = res.rowcount
# For each name in the new beacons: get firstseen, lastseen and last values != NULL # For each name in the new beacons: get firstseen, lastseen and last values != NULL
last_valid_values = app.session.query(distinct(ReceiverBeacon.name).label('name'), last_valid_values = app.session.query(
distinct(ReceiverBeacon.name).label('name'),
func.first_value(ReceiverBeacon.timestamp) func.first_value(ReceiverBeacon.timestamp)
.over(partition_by=ReceiverBeacon.name, order_by=case([(ReceiverBeacon.timestamp == null(), None), (ReceiverBeacon.timestamp != null(), ReceiverBeacon.timestamp)])) .over(partition_by=ReceiverBeacon.name, order_by=case([(ReceiverBeacon.timestamp == null(), None), (ReceiverBeacon.timestamp != null(), ReceiverBeacon.timestamp)]))
.label('firstseen'), .label('firstseen'),
@ -169,7 +174,8 @@ def update_receivers():
.filter(ReceiverBeacon.receiver_id == null()) \ .filter(ReceiverBeacon.receiver_id == null()) \
.subquery() .subquery()
update_values = app.session.query(Receiver.name, update_values = app.session.query(
Receiver.name,
case([(or_(Receiver.firstseen == null(), Receiver.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen), case([(or_(Receiver.firstseen == null(), Receiver.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
(Receiver.firstseen <= last_valid_values.c.firstseen, Receiver.firstseen)]).label('firstseen'), (Receiver.firstseen <= last_valid_values.c.firstseen, Receiver.firstseen)]).label('firstseen'),
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen), case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
@ -189,7 +195,8 @@ def update_receivers():
update_receivers = app.session.query(Receiver) \ update_receivers = app.session.query(Receiver) \
.filter(Receiver.name == update_values.c.name) \ .filter(Receiver.name == update_values.c.name) \
.update({Receiver.firstseen: update_values.c.firstseen, .update({
Receiver.firstseen: update_values.c.firstseen,
Receiver.lastseen: update_values.c.lastseen, Receiver.lastseen: update_values.c.lastseen,
Receiver.location_wkt: update_values.c.location_wkt, Receiver.location_wkt: update_values.c.location_wkt,
Receiver.altitude: update_values.c.altitude, Receiver.altitude: update_values.c.altitude,

3
ogn/commands/database.py
Wyświetl plik

@ -93,7 +93,8 @@ def update_receivers():
def update_receiver_stats(): def update_receiver_stats():
"""Add/update entries in receiver stats table.""" """Add/update entries in receiver stats table."""
asdf = session.query(ReceiverBeacon.receiver_id, asdf = session.query(
ReceiverBeacon.receiver_id,
func.count(distinct(AircraftBeacon.device_id)).label('device_count'), func.count(distinct(AircraftBeacon.device_id)).label('device_count'),
func.max(AircraftBeacon.altitude).label('max_altitude'), func.max(AircraftBeacon.altitude).label('max_altitude'),
func.max(func.ST_Distance(AircraftBeacon.location_wkt, AircraftBeacon.location_wkt)).label('max_distance')) \ func.max(func.ST_Distance(AircraftBeacon.location_wkt, AircraftBeacon.location_wkt)).label('max_distance')) \