X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fevstore.py;h=07b6dc4b760b7de08349611e844168ab0e80470a;hb=c3bc6d5bbdc0d0bf10e338c6e3bad1a519d5afa0;hp=70a3ac6618bec9bd67f53ff7fa9a30a6d92484c4;hpb=623ff0272e0344c26549bbed937d1d33b9822d18;p=loctrkd.git

diff --git a/gps303/evstore.py b/gps303/evstore.py
index 70a3ac6..07b6dc4 100644
--- a/gps303/evstore.py
+++ b/gps303/evstore.py
@@ -1,8 +1,9 @@
 """ sqlite event store """
 
-from sqlite3 import connect
+from sqlite3 import connect, OperationalError
+from typing import Any, List, Tuple
 
-__all__ = "initdb", "stow"
+__all__ = "fetch", "initdb", "stow"
 
 DB = None
 
@@ -10,36 +11,66 @@ SCHEMA = """create table if not exists events (
     tstamp real not null,
     imei text,
     peeraddr text not null,
-    proto int 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
     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(**kwargs):
+def stow(**kwargs: Any) -> None:
     assert DB is not None
     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", -1),
+            ("proto", "UNKNOWN"),
             ("packet", b""),
         )
     }
     assert len(kwargs) <= len(parms)
     DB.execute(
         """insert or ignore into events
-                (tstamp, imei, peeraddr, proto, packet)
+                (tstamp, imei, peeraddr, proto, packet, is_incoming)
                 values
-                (:when, :imei, :peeraddr, :proto, :packet)
+                (: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))