Merge pull request #109 from ActivityWatch/dev/get-single-event-by-id

Author: ErikBjare

Makefile

@@ -18,10 +18,10 @@ typecheck:
 typecheck-strict:
 	export MYPYPATH=./stubs; python -m mypy aw_core aw_datastore aw_transform aw_query --strict-optional --check-untyped-defs; echo "Not a failing step"
 
-PYFILES=aw_core/**.py aw_datastore/**.py aw_query/**.py aw_transform/**.py
+PYFILES=$(shell find . -type f -name '*.py')
 
 lint-fix:
-	pyupgrade --py37-plus ${PYFILES}
+	pyupgrade --py37-plus ${PYFILES} && true
 	black ${PYFILES}
 
 clean:

aw_datastore/datastore.py

@@ -102,6 +102,9 @@ def get(
             self.bucket_id, limit, starttime, endtime
         )
 
+    def get_by_id(self, event_id) -> Event:
+        return self.ds.storage_strategy.get_event(self.bucket_id, event_id)
+
     def get_eventcount(
         self, starttime: datetime = None, endtime: datetime = None
     ) -> int:

aw_datastore/storages/abstract.py

@@ -42,6 +42,14 @@ def delete_bucket(self, bucket_id: str) -> None:
     def get_metadata(self, bucket_id: str) -> dict:
         raise NotImplementedError
 
+    @abstractmethod
+    def get_event(
+        self,
+        bucket_id: str,
+        event_id: int,
+    ) -> Event:
+        raise NotImplementedError
+
     @abstractmethod
     def get_events(
         self,

aw_datastore/storages/memory.py

@@ -49,6 +49,14 @@ def buckets(self):
             buckets[bucket_id] = self.get_metadata(bucket_id)
         return buckets
 
+    def get_event(
+        self,
+        bucket_id: str,
+        event_id: int,
+    ) -> Event:
+        event = self._get_event(bucket_id, event_id)
+        return copy.deepcopy(event)
+
     def get_events(
         self,
         bucket: str,
@@ -117,6 +125,15 @@ def delete(self, bucket_id, event_id):
             return True
         return False
 
+    def _get_event(self, bucket_id, event_id):
+        events = [
+            event
+            for idx, event in reversed(list(enumerate(self.db[bucket_id])))
+            if event.id == event_id
+        ]
+        assert len(events) == 1
+        return events[0]
+
     def replace(self, bucket_id, event_id, event):
         for idx in (
             idx

aw_datastore/storages/mongodb.py

@@ -99,7 +99,7 @@ def get_events(
         if limit == 0:
             return []
         elif limit < 0:
-            limit = 10 ** 9
+            limit = 10**9
         ds_events = list(
             self.db[bucket_id]["events"]
             .find(query_filter)

aw_datastore/storages/peewee.py

@@ -254,6 +254,17 @@ def replace(self, bucket_id, event_id, event):
         event.id = e.id
         return event
 
+    def get_event(
+        self,
+        bucket_id: str,
+        event_id: int,
+    ):
+        """
+        Fetch a single event from a bucket.
+        """
+        res = self._get_event(bucket_id, event_id)
+        return Event(**EventModel.json(res))
+
     def get_events(
         self,
         bucket_id: str,

aw_datastore/storages/sqlite.py

@@ -1,4 +1,4 @@
-from typing import Optional, List
+from typing import Optional, List, Iterable
 from datetime import datetime, timezone, timedelta
 import json
 import os
@@ -16,7 +16,7 @@
 LATEST_VERSION = 1
 
 # The max integer value in SQLite is signed 8 Bytes / 64 bits
-MAX_TIMESTAMP = 2 ** 63 - 1
+MAX_TIMESTAMP = 2**63 - 1
 
 CREATE_BUCKETS_TABLE = """
     CREATE TABLE IF NOT EXISTS buckets (
@@ -54,6 +54,18 @@
 """
 
 
+def _rows_to_events(rows: Iterable) -> List[Event]:
+    events = []
+    for row in rows:
+        eid = row[0]
+        starttime = datetime.fromtimestamp(row[1] / 1000000, timezone.utc)
+        endtime = datetime.fromtimestamp(row[2] / 1000000, timezone.utc)
+        duration = endtime - starttime
+        data = json.loads(row[3])
+        events.append(Event(id=eid, timestamp=starttime, duration=duration, data=data))
+    return events
+
+
 class SqliteStorage(AbstractStorage):
     sid = "sqlite"
 
@@ -256,6 +268,23 @@ def replace(self, bucket_id, event_id, event) -> bool:
         self.conditional_commit(1)
         return True
 
+    def get_event(
+        self,
+        bucket_id: str,
+        event_id: int,
+    ) -> Event:
+        self.commit()
+        c = self.conn.cursor()
+        query = """
+            SELECT id, starttime, endtime, datastr
+            FROM events
+            WHERE bucketrow = (SELECT rowid FROM buckets WHERE id = ?) AND id = ?
+            LIMIT 1
+        """
+        rows = c.execute(query, [bucket_id, event_id])
+        events = _rows_to_events(rows)
+        return events[0]
+
     def get_events(
         self,
         bucket_id: str,
@@ -279,16 +308,7 @@ def get_events(
             ORDER BY endtime DESC LIMIT ?
         """
         rows = c.execute(query, [bucket_id, starttime_i, endtime_i, limit])
-        events = []
-        for row in rows:
-            eid = row[0]
-            starttime = datetime.fromtimestamp(row[1] / 1000000, timezone.utc)
-            endtime = datetime.fromtimestamp(row[2] / 1000000, timezone.utc)
-            duration = endtime - starttime
-            data = json.loads(row[3])
-            events.append(
-                Event(id=eid, timestamp=starttime, duration=duration, data=data)
-            )
+        events = _rows_to_events(rows)
         return events
 
     def get_eventcount(