Merge branch 'master' into dev/macos-sign-and-notarize

Makefile

@@ -40,13 +40,21 @@ build:
 	make --directory=aw-watcher-afk build
 	make --directory=aw-watcher-window build
 	make --directory=aw-server build SKIP_WEBUI=$(SKIP_WEBUI)
-	make --directory=aw-server-rust build SKIP_WEBUI=$(SKIP_WEBUI)
+ifndef SKIP_SERVER_RUST  # Skip building aw-server-rust if SKIP_SERVER_RUST is defined
+	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
 	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
@@ -145,11 +153,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

README.md

@@ -34,7 +34,7 @@
 
 <p align="center">
   <a href="https://activitywatch.net/donate/">
-    <img title="Donated" src="https://img.shields.io/badge/current%20budget-%2437%2Fmo%20from%2015%20supporters-red.svg" />
+    <img title="Donated" src="https://img.shields.io/badge/budget-%2487%2Fmo%20from%2040%20supporters-orange.svg" />
   </a>
 
   <br>
@@ -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            |

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<details><summary><b>{title}</b></summary>\n<p>\n"
-    out += body
-    out += "\n\n</p></details>"
+def wrap_details(title, body, wraplines=5):
+    """Wrap lines into a <details> element if body is longer than `wraplines`"""
+    out = f"\n\n### {title}"
+    if body.count("\n") > wraplines:
+        out += "\n<details><summary>Click to expand</summary>"
+    out += f"\n<p>{body}\n</p>\n"
+    if body.count("\n") > wraplines:
+        out += "</details>"
     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)
 

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