Store frames in database, remove frames older than chosen age.

This commit is contained in:
W1CDN 2023-04-14 22:06:48 -05:00
parent b06b87fe4e
commit 63963c0ade
4 changed files with 116 additions and 22 deletions

View File

@ -7,3 +7,6 @@ log_folder = logs/
station_call = W1CDN-1 station_call = W1CDN-1
station_lat = 47.941500 station_lat = 47.941500
station_lon = -97.027000 station_lon = -97.027000
# How long to keep packets (frames) e.g., "2 days", "5 minutes"
keep_time = "2 days"

View File

@ -1,14 +0,0 @@
import sqlite3
def get_db_connection():
conn = sqlite3.connect('database.db')
conn.row_factory = sqlite3.Row
return conn
frame1 = "W1CDN-1>APDW16,K0UND-2*:;147.390GF*111111z4755.45N/09700.58Wr147.390MHz +060 https://www.wa0jxt.org/"
conn = get_db_connection()
conn.execute('INSERT INTO frames (frame) VALUES (?)',
(frame1,))
conn.commit()
conn.close()

View File

@ -2,6 +2,42 @@ DROP TABLE IF EXISTS frames;
CREATE TABLE frames ( CREATE TABLE frames (
id INTEGER PRIMARY KEY AUTOINCREMENT, id INTEGER PRIMARY KEY AUTOINCREMENT,
addresse TEXT,
alive INT,
altitude REAL,
comment TEXT,
course REAL,
created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
frame TEXT NOT NULL format TEXT,
frame TEXT,
"from" TEXT,
gpsfixstatus TEXT,
latitude REAL,
longitude REAL,
mbits INT,
messagecapable INT,
message_text TEXT,
mtype TEXT,
object_format TEXT,
object_name TEXT,
path TEXT,
posambiguity INT,
raw TEXT,
raw_timestamp TEXT,
speed REAL,
station_call TEXT,
station_lat REAL,
station_lon REAL,
status TEXT,
symbol TEXT,
symbol_table TEXT,
telemetry TEXT,
timestamp INT,
"to" TEXT,
tEQNS TEXT,
tPARM TEXT,
tUNIT TEXT,
via TEXT,
weather TEXT,
wx_raw_timestamp TIMESTAMP
); );

View File

@ -4,37 +4,106 @@ import sqlite3
import aprs import aprs
import json import json
import aprslib import aprslib
import configparser
MYCALL = os.environ.get("MYCALL", "W1CDN") MYCALL = os.environ.get("MYCALL", "W1CDN")
KISS_HOST = os.environ.get("KISS_HOST", "192.168.0.30") KISS_HOST = os.environ.get("KISS_HOST", "192.168.0.30")
KISS_PORT = os.environ.get("KISS_PORT", "8001") KISS_PORT = os.environ.get("KISS_PORT", "8001")
db_fields = ("id",
"addresse",
"alive",
"altitude",
"comment",
"course",
"created",
"format",
"frame",
"from",
"gpsfixstatus",
"latitude",
"longitude",
"mbits",
"messagecapable",
"message_text",
"mtype",
"object_format",
"object_name",
"path",
"posambiguity",
"raw",
"raw_timestamp",
"speed",
"station_call",
"station_lat",
"station_lon",
"status",
"symbol",
"symbol_table",
"telemetry",
"timestamp",
"to",
"tEQNS",
"tPARM",
"tUNIT",
"via",
"weather",
"wx_raw_timestamp")
def read_config():
config = configparser.ConfigParser()
config.read('config.ini')
return config
def get_db_connection(): def get_db_connection():
conn = sqlite3.connect('database.db') conn = sqlite3.connect('database.db')
conn.row_factory = sqlite3.Row conn.row_factory = sqlite3.Row
return conn return conn
def main(): def main():
# Add the call and location of this station to the packet info
config = read_config()
ki = aprs.TCPKISS(host=KISS_HOST, port=int(KISS_PORT)) ki = aprs.TCPKISS(host=KISS_HOST, port=int(KISS_PORT))
ki.start() ki.start()
# Make a simple frame and send it
frame = aprs.APRSFrame.ui( frame = aprs.APRSFrame.ui(
destination="APZ001", destination="APZ001",
source=MYCALL, source=MYCALL,
path=["WIDE1-1"], path=["WIDE1-1"],
info=b">Hello World!", info=b">Hello World!",
) )
ki.write(frame) #ki.write(frame)
# Watch for new packets to come in
while True: while True:
conn = get_db_connection()
for frame in ki.read(min_frames=1): for frame in ki.read(min_frames=1):
#print(repr(frame))
a = aprslib.parse(str(frame)) a = aprslib.parse(str(frame))
a['station_call'] = config['Settings']['station_call']
a['station_lat'] = config['Settings']['station_lat']
a['station_lon'] = config['Settings']['station_lon']
print(a) print(a)
conn = get_db_connection() # Make this a string and deal with it later (probably a mistake)
# conn.execute('INSERT INTO frames (frame) VALUES (?)', a['path'] = str(a['path'])
# (a,)) # Build an INSERT statement based on the fields we have from the frame
attrib_names = ', '.join(f'"{w}"' for w in a.keys())
attrib_values = ", ".join("?" * len(a.keys()))
sql = f"INSERT INTO frames ({attrib_names}) VALUES ({attrib_values})"
# Insert data
conn.execute(sql, list(a.values()))
conn.commit() conn.commit()
conn.close()
# TODO remove packets that are older ('created') than a limit set in config.ini
# "5 minutes" also works
conn.execute("DELETE FROM frames WHERE created < DATETIME('now', '"+config['Settings']['keep_time']+"')")
conn.commit()
conn.close()
if __name__ == "__main__": if __name__ == "__main__":
main() main()