kopia lustrzana https://github.com/glidernet/ogn-python
Take ReceiverDevice instead of ReceiverBeacon
rodzic
5108c65f53
commit
156b69a27d
|
@ -5,6 +5,7 @@ from sqlalchemy import distinct, and_
|
|||
|
||||
from ogn.db import session
|
||||
from ogn.model import ReceiverBeacon
|
||||
from ogn.model.receiver_device import ReceiverDevice
|
||||
|
||||
back_24h = datetime.utcnow() - timedelta(days=1)
|
||||
receiver_messages_per_24h = 24*60 / 5
|
||||
|
@ -16,13 +17,13 @@ def get_receiver_info():
|
|||
group_by(ReceiverBeacon.name).\
|
||||
subquery()
|
||||
|
||||
query = session.query(ReceiverBeacon, sq.c.messages_count).\
|
||||
filter(and_(ReceiverBeacon.name == sq.c.name, ReceiverBeacon.timestamp == sq.c.lastseen)).\
|
||||
order_by(ReceiverBeacon.name)
|
||||
query = session.query(ReceiverDevice, sq.c.messages_count).\
|
||||
filter(ReceiverDevice.name == sq.c.name).\
|
||||
order_by(ReceiverDevice.name)
|
||||
|
||||
print('--- Receivers ---')
|
||||
for [receiver, messages_count] in query.all():
|
||||
print('%9s: %3d%% avail, %s, %s ' % (receiver.name, 100.0*float(messages_count/receiver_messages_per_24h), receiver.version, receiver.platform))
|
||||
print('%9s (%2s): %3d%% avail, %s, %s ' % (receiver.name, receiver.country_code, 100.0*float(messages_count/receiver_messages_per_24h), receiver.version, receiver.platform))
|
||||
|
||||
|
||||
def get_software_stats():
|
||||
|
|
Ładowanie…
Reference in New Issue