Added aw-client testing to Makefile, updated README, updated submodules

snowy1220 · Apr 10, 2018 · ab8868a · ab8868a
1 parent 94355a0
commit ab8868a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -79,6 +79,7 @@ uninstall:
 
 test:
 	make --directory=aw-core test
+	make --directory=aw-client test
 	make --directory=aw-server test
 	make --directory=aw-qt test
 

diff --git a/README.md b/README.md
@@ -190,15 +190,25 @@ This repo is a bundle of the core components and official modules of ActivityWat
 
 ### Server
 
-`aw-server` is the official implementation of the core service which the other ActivityWatch services interact with. It provides a datastore and serves the web interface developed in the *aw-webui* project (which provides the frontend part of the webapp).
+`aw-server` is the official implementation of the core service which the other ActivityWatch services interact with. It provides a REST API to a datastore and query engine. It also serves the web interface developed in the `aw-webui` project (which provides the frontend part of the webapp).
 
-The webapp includes basic data visualization (WIP), data browsing and export, and has a lot more planned for it.
+The REST API includes:
+
+ - Access to a datastore suitable for timeseries/timeperiod-data
+ - A query engine and language for such data
+
+The webapp includes:
+
+ - Data visualization & browser
+ - Query explorer
+ - Export functionality 
+   - Import is not currently implemented, see [issue #103](https://github.com/ActivityWatch/activitywatch/issues/103).
 
 ### Watchers
 
- - `aw-watcher-afk` - can be used to log the presence/absence of user activity from keyboard and mouse input
- - `aw-watcher-window` - can be used to log the currently active application and it's window title
- - `aw-watcher-web` - can be used to increase the logging detail when browsing the web by collecting the URL and title of the active tab (your web history with superpowers)
+ - `aw-watcher-afk` - logs the presence/absence of user activity from keyboard and mouse input
+ - `aw-watcher-window` - logs the currently active application and it's window title
+ - `aw-watcher-web` - logs your web browsing in better detail (notably the URL in addition to the title of the page)
 
 ### Libraries
 

diff --git a/aw-core b/aw-core
diff --git a/aw-qt b/aw-qt
diff --git a/aw-server b/aw-server
+1 −2		.travis.yml
+1 −0		aw_analysis/__init__.py
+15 −16		aw_analysis/query2.py
+11 −0		aw_analysis/query2_error.py
+90 −31		aw_analysis/query2_functions.py
+1 −1		aw_core/__about__.py
+7 −0		aw_datastore/datastore.py
+1 −0		aw_transform/__init__.py
+4 −1		aw_transform/filter_period_intersect.py
+1 −1		aw_transform/heartbeats.py
+19 −0		aw_transform/simplify.py
+3 −0		requirements-dev.txt
+114 −121		tests/test_query2.py
+29 −2		tests/test_transforms.py
+38 −11		aw_server/api.py
+2 −1		aw_server/main.py
+63 −13		aw_server/rest.py
+5 −1		aw_server/server.py
+18 −2		tests/test_client.py