From aa6336334018d90c542a990315690bbf87d2b8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 16 Sep 2021 14:33:02 +0200 Subject: [PATCH 01/15] docs: updated budget badge, marked Android support as not-WIP --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c905fff5..00bace16 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@

- +
@@ -154,13 +154,11 @@ We have a plan to address all of these and we're well on our way. See the table | | Windows | macOS | Linux | Android | iOS | | ------------- |:------------------:|:------------------:|:------------------:|:------------------:|:-------------------:| -| ActivityWatch | :white_check_mark: | :white_check_mark: | :white_check_mark: | [WIP][android] |:x: | +| ActivityWatch | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |:x: | | Selfspy | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: |:x: | | ulogme | :x: | :white_check_mark: | :white_check_mark: | :x: |:x: | | RescueTime | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |Limited functionality| -[android]: https://github.com/ActivityWatch/activitywatch/issues/6 - ##### Tracking | | App & Window Title | AFK | Browser Extensions | Editor Plugins | Extensible | From 02cdd4fe1867cae853f6ede3e8e867daf170eb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 16 Sep 2021 14:37:45 +0200 Subject: [PATCH 02/15] docs: changed color of budget badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00bace16..ca3b3dea 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@

- +
From a0750f5cc3c5b17fff94e79986b332307ea2b953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 16 Sep 2021 16:45:04 +0200 Subject: [PATCH 03/15] build(deps): updated submodules --- aw-server | 2 +- aw-server-rust | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aw-server b/aw-server index 31779e68..6c7c1bda 160000 --- a/aw-server +++ b/aw-server @@ -1 +1 @@ -Subproject commit 31779e68552733e25d86342c7670ff0ee19b3875 +Subproject commit 6c7c1bdad5c2ee0b0ec4a4395c4ebe220cfc0b47 diff --git a/aw-server-rust b/aw-server-rust index bd3af6ff..f43b3911 160000 --- a/aw-server-rust +++ b/aw-server-rust @@ -1 +1 @@ -Subproject commit bd3af6ff6dd91c8bec94fc82fcc28b2962923e34 +Subproject commit f43b3911ffe44deb272f6aa381778cdbe7d29b77 From 57518302aac9f68b48e9bd30c073c54b98ad2cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Fri, 17 Sep 2021 13:18:33 +0200 Subject: [PATCH 04/15] build(deps): updated aw-watcher-window --- aw-watcher-window | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-watcher-window b/aw-watcher-window index 80967e7f..2df3e345 160000 --- a/aw-watcher-window +++ b/aw-watcher-window @@ -1 +1 @@ -Subproject commit 80967e7f7aeefb6db801bfb4ec0029b1dbd0549d +Subproject commit 2df3e34522a7e5ee67ad48b286969d0d021b58c4 From dbcd092bcdf2c7ec7b2cf0eeff8c667cc368fa8d Mon Sep 17 00:00:00 2001 From: Pavel Moiseenko <19418601+rakleed@users.noreply.github.com> Date: Fri, 17 Sep 2021 14:20:27 +0300 Subject: [PATCH 05/15] build(windows): specify name of app in list of installed apps (#638) --- scripts/package/activitywatch-setup.iss | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/package/activitywatch-setup.iss b/scripts/package/activitywatch-setup.iss index 9354c355..3ac49100 100644 --- a/scripts/package/activitywatch-setup.iss +++ b/scripts/package/activitywatch-setup.iss @@ -30,6 +30,7 @@ PrivilegesRequiredOverridesAllowed=dialog OutputDir={#DistDir} OutputBaseFilename=activitywatch-setup SetupIconFile="{#RootDir}\aw-qt\media\logo\logo.ico" +UninstallDisplayName={#MyAppName} UninstallDisplayIcon={app}\{#MyAppExeName} Compression=lzma SolidCompression=yes From 040c05ae96527da50689a92ba7f20bbf937a6447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 23 Sep 2021 15:26:22 +0200 Subject: [PATCH 06/15] build(deps): updated submodule --- aw-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-client b/aw-client index 0c0f4a03..621584ff 160000 --- a/aw-client +++ b/aw-client @@ -1 +1 @@ -Subproject commit 0c0f4a03b286f9c708d78fba763e424c25f9f7b6 +Subproject commit 621584ff041dc67731209e1778795e210af8ee86 From 742c6f943b4212e27f9bde93942847a45f4b5e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Tue, 28 Sep 2021 17:25:53 +0200 Subject: [PATCH 07/15] build(deps): updated submodules --- aw-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-server b/aw-server index 6c7c1bda..1fd1ed6d 160000 --- a/aw-server +++ b/aw-server @@ -1 +1 @@ -Subproject commit 6c7c1bdad5c2ee0b0ec4a4395c4ebe220cfc0b47 +Subproject commit 1fd1ed6de0eb099a6723c59436ffd203bc8c0548 From d9d653b22e73b8b19328ed4fdcdbf10357425e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 14 Oct 2021 11:06:11 +0200 Subject: [PATCH 08/15] build(deps): updated submodules --- aw-core | 2 +- aw-watcher-afk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aw-core b/aw-core index efd13251..5dbb6109 160000 --- a/aw-core +++ b/aw-core @@ -1 +1 @@ -Subproject commit efd1325125497427ee20786694bfba1b30ad48bc +Subproject commit 5dbb6109c91b8c7a6f4e228697dd58f6c98ba410 diff --git a/aw-watcher-afk b/aw-watcher-afk index 30b6d278..7ce0d6b3 160000 --- a/aw-watcher-afk +++ b/aw-watcher-afk @@ -1 +1 @@ -Subproject commit 30b6d27881d1798b8f02e9fea25830b7c9b556ca +Subproject commit 7ce0d6b389ed87acdf7ad0876b9372c769b63f66 From d69c9d0cd69beaf4f9e9ec29ec3974fd1e4c080f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 14 Oct 2021 12:50:03 +0200 Subject: [PATCH 09/15] build(deps): updated submodules --- aw-client | 2 +- aw-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aw-client b/aw-client index 621584ff..bc644917 160000 --- a/aw-client +++ b/aw-client @@ -1 +1 @@ -Subproject commit 621584ff041dc67731209e1778795e210af8ee86 +Subproject commit bc644917ccc9cd036917c68cdb29361ed07d7b36 diff --git a/aw-core b/aw-core index 5dbb6109..1dce996d 160000 --- a/aw-core +++ b/aw-core @@ -1 +1 @@ -Subproject commit 5dbb6109c91b8c7a6f4e228697dd58f6c98ba410 +Subproject commit 1dce996d1de92956178aefdea24ac5203ddb8f0e From 238caa489fcc5aa4c3a7d1167e684ac06785380f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Wed, 27 Oct 2021 09:42:09 +0200 Subject: [PATCH 10/15] build(deps): updated submodules --- aw-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aw-server b/aw-server index 1fd1ed6d..82a049b0 160000 --- a/aw-server +++ b/aw-server @@ -1 +1 @@ -Subproject commit 1fd1ed6de0eb099a6723c59436ffd203bc8c0548 +Subproject commit 82a049b0cc39fc0d4ee0a36bc2d5cfba3972289a From 1e51f223604c6b2c0ae54ecb6908b777d6241ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Fri, 5 Nov 2021 18:58:25 +0100 Subject: [PATCH 11/15] fix: misc improvements to build_changelog.py script --- scripts/build_changelog.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/build_changelog.py b/scripts/build_changelog.py index f84591b1..4155d562 100755 --- a/scripts/build_changelog.py +++ b/scripts/build_changelog.py @@ -94,10 +94,14 @@ def commit_linkify(commitid: str, repo: str) -> str: return f"[`{commitid}`](https://github.com/ActivityWatch/{repo}/commit/{commitid})" -def wrap_details(title, body): - out = f"\n\n

{title}\n

\n" - out += body - out += "\n\n

" +def wrap_details(title, body, wraplines=5): + """Wrap lines into a
element if body is longer than `wraplines`""" + out = f"\n\n### {title}" + if body.count("\n") > wraplines: + out += "\n
Click to expand" + out += f"\n

{body}\n

\n" + if body.count("\n") > wraplines: + out += "
" return out @@ -170,9 +174,10 @@ def summary_repo(path: str, commitrange: str, filter_types: List[str]) -> str: def build(filter_types=["build", "ci", "tests"]): # prev_release = run("git describe --tags --abbrev=0").strip() - prev_release = "v0.10.0" + prev_release = "v0.11.0" + next_release = "master" output = summary_repo( - ".", commitrange=f"{prev_release}...master", filter_types=filter_types + ".", commitrange=f"{prev_release}...{next_release}", filter_types=filter_types ) print(output) From e434eddb4b12ca87ba837f826a5d82d6166ebeb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Fri, 12 Nov 2021 13:37:36 +0100 Subject: [PATCH 12/15] build(deps): updated submodules --- aw-client | 2 +- aw-core | 2 +- aw-server | 2 +- aw-server-rust | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aw-client b/aw-client index bc644917..1318406a 160000 --- a/aw-client +++ b/aw-client @@ -1 +1 @@ -Subproject commit bc644917ccc9cd036917c68cdb29361ed07d7b36 +Subproject commit 1318406ab0bf1728e77b3f6cef09f2ca5c8afdc3 diff --git a/aw-core b/aw-core index 1dce996d..22d3ded6 160000 --- a/aw-core +++ b/aw-core @@ -1 +1 @@ -Subproject commit 1dce996d1de92956178aefdea24ac5203ddb8f0e +Subproject commit 22d3ded6e0a6becc6bae77f3539f317aebef9b85 diff --git a/aw-server b/aw-server index 82a049b0..7399920e 160000 --- a/aw-server +++ b/aw-server @@ -1 +1 @@ -Subproject commit 82a049b0cc39fc0d4ee0a36bc2d5cfba3972289a +Subproject commit 7399920e09f44c2af792cda278dbf2dd3ea9f291 diff --git a/aw-server-rust b/aw-server-rust index f43b3911..b5c722f6 160000 --- a/aw-server-rust +++ b/aw-server-rust @@ -1 +1 @@ -Subproject commit f43b3911ffe44deb272f6aa381778cdbe7d29b77 +Subproject commit b5c722f63d095c92f123c72e2d7fe66c942859f9 From d3bbcba13eb45b1bd01da016112bb4e892e8132d Mon Sep 17 00:00:00 2001 From: Michael Jelly <53475252+michaeljelly@users.noreply.github.com> Date: Wed, 5 Jan 2022 00:48:46 -0800 Subject: [PATCH 13/15] ci: change use `python` to `python3` (#696) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f05c552b..c5723729 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ build: make --directory=aw-client build make --directory=aw-core build # Needed to ensure that the server has the correct version set - python -c "import aw_server; print(aw_server.__version__)" + python3 -c "import aw_server; print(aw_server.__version__)" # Install From 122613b7a9c6491b228a13622bc157e7e7e8073a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Wed, 5 Jan 2022 09:57:13 +0100 Subject: [PATCH 14/15] build: added Makefile option SKIP_SERVER_RUST --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c5723729..b8934d77 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,9 @@ build: make --directory=aw-watcher-afk build make --directory=aw-watcher-window build make --directory=aw-server build SKIP_WEBUI=$(SKIP_WEBUI) +ifndef SKIP_SERVER_RUST # Skip building aw-server-rust if SKIP_SERVER_RUST is defined make --directory=aw-server-rust build SKIP_WEBUI=$(SKIP_WEBUI) +endif make --directory=aw-qt build # The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173 make --directory=aw-client build @@ -143,11 +145,11 @@ package: # make --directory=aw-server package cp -r aw-server/dist/aw-server dist/activitywatch -# +ifndef SKIP_SERVER_RUST make --directory=aw-server-rust package mkdir -p dist/activitywatch/aw-server-rust cp -r aw-server-rust/target/package/* dist/activitywatch/aw-server-rust -# +endif make --directory=aw-qt package cp -r aw-qt/dist/aw-qt/. dist/activitywatch # Remove problem-causing binaries, see https://github.com/ActivityWatch/activitywatch/issues/161 From e2b6aa72bc1e7d56ed70a701c453ab82dbe87de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Mon, 4 Oct 2021 09:35:53 +0200 Subject: [PATCH 15/15] ci: skip building aw-server-rust if cargo is not installed --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8934d77..4a006e26 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,13 @@ build: make --directory=aw-watcher-window build make --directory=aw-server build SKIP_WEBUI=$(SKIP_WEBUI) ifndef SKIP_SERVER_RUST # Skip building aw-server-rust if SKIP_SERVER_RUST is defined - make --directory=aw-server-rust build SKIP_WEBUI=$(SKIP_WEBUI) + echo 'Looking for rust...' + if (which cargo); then \ + echo 'Rust found!'; \ + make --directory=aw-server-rust build SKIP_WEBUI=$(SKIP_WEBUI); \ + else \ + echo 'Rust not found, skipping aw-server-rust!'; \ + fi endif make --directory=aw-qt build # The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173