X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fevstore.py;h=07b6dc4b760b7de08349611e844168ab0e80470a;hb=bf48ccad4b4b91e7d7e09d1087f5953bc2db97d7;hp=9bc60d5594a1f7656360fff741cbe1470ed346ab;hpb=4aaa5cd899d6b2bb9fd5e90dfac3d43461394e9b;p=loctrkd.git

diff --git a/gps303/evstore.py b/gps303/evstore.py
index 9bc60d5..07b6dc4 100644
--- a/gps303/evstore.py
+++ b/gps303/evstore.py
@@ -1,43 +1,76 @@
-from logging import getLogger
-from sqlite3 import connect
+""" sqlite event store """
 
-__all__ = ("initdb", "stow")
+from sqlite3 import connect, OperationalError
+from typing import Any, List, Tuple
 
-log = getLogger("gps303")
+__all__ = "fetch", "initdb", "stow"
 
 DB = None
 
 SCHEMA = """create table if not exists events (
-    timestamp real not null,
+    tstamp real not null,
     imei text,
-    clntaddr text not null,
-    length int,
-    proto int not null,
-    payload blob
+    peeraddr text not null,
+    is_incoming int not null default TRUE,
+    proto text not null,
+    packet blob
 )"""
 
 
-def initdb(dbname):
+def initdb(dbname: str) -> None:
     global DB
-    log.info('Using Sqlite3 database "%s"', dbname)
     DB = connect(dbname)
-    DB.execute(SCHEMA)
+    try:
+        DB.execute(
+            """alter table events add column
+                is_incoming int not null default TRUE"""
+        )
+    except OperationalError:
+        DB.execute(SCHEMA)
 
 
-def stow(clntaddr, timestamp, imei, length, proto, payload):
+def stow(**kwargs: Any) -> None:
     assert DB is not None
-    parms = dict(
-        zip(
-            ("clntaddr", "timestamp", "imei", "length", "proto", "payload"),
-            (str(clntaddr), timestamp, imei, length, proto, payload),
+    parms = {
+        k: kwargs[k] if k in kwargs else v
+        for k, v in (
+            ("is_incoming", True),
+            ("peeraddr", None),
+            ("when", 0.0),
+            ("imei", None),
+            ("proto", "UNKNOWN"),
+            ("packet", b""),
         )
-    )
+    }
+    assert len(kwargs) <= len(parms)
     DB.execute(
         """insert or ignore into events
-                (timestamp, imei, clntaddr, length, proto, payload)
+                (tstamp, imei, peeraddr, proto, packet, is_incoming)
                 values
-                (:timestamp, :imei, :clntaddr, :length, :proto, :payload)
+                (:when, :imei, :peeraddr, :proto, :packet, :is_incoming)
         """,
         parms,
     )
     DB.commit()
+
+
+def fetch(
+    imei: str, matchlist: List[Tuple[bool, str]], backlog: int
+) -> List[Tuple[bool, float, bytes]]:
+    # matchlist is a list of tuples (is_incoming, proto)
+    # returns a list of tuples (is_incoming, timestamp, packet)
+    assert DB is not None
+    selector = " or ".join(
+        (f"(is_incoming = ? and proto = ?)" for _ in range(len(matchlist)))
+    )
+    cur = DB.cursor()
+    cur.execute(
+        f"""select is_incoming, tstamp, packet from events
+                    where ({selector}) and imei = ?
+                    order by tstamp desc limit ?""",
+        tuple(item for sublist in matchlist for item in sublist)
+        + (imei, backlog),
+    )
+    result = list(cur)
+    cur.close()
+    return list(reversed(result))