From e096146937e895934e788198e75f20ef7e9c52e7 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 1 Apr 2021 16:19:50 +0200 Subject: feat(web/todolist): Drop 'TODO' prefixes in individual items This modifies the capture regex executed by `jq` to capture the TODO text itself as a separate capture group, which is then used for the content of the TODO listing. The web listing looks much cleaner this way. Change-Id: I00a14da57b315a353f700c112ba33f38e16f1f85 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2749 Tested-by: BuildkiteCI Reviewed-by: flokli --- web/todolist/extract-todos.jq | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'web/todolist') diff --git a/web/todolist/extract-todos.jq b/web/todolist/extract-todos.jq index cda717fceb..d4e0476c40 100644 --- a/web/todolist/extract-todos.jq +++ b/web/todolist/extract-todos.jq @@ -3,15 +3,20 @@ # # This assumes that the filter used is something like 'TODO\(\w+\):' +# Capture the username and todo entry from an input string. +def capture_todo: + capture("TODO\\((?\\w+)\\):\\s+(?.*)$"); + # Construct a structure with only the fields we need to populate the # page. def simplify_match: - .data.submatches[0].match.text as $todo + .data as $data + | (.data.submatches[0].match.text | capture_todo) as $capture | { - file: (.data.path.text | sub("/nix/store/.+-depot/"; "")), - line: .data.line_number, - todo: $todo, - user: ($todo | capture("TODO\\((?\\w+)\\)") | .user), + file: ($data | .path.text | sub("/nix/store/.+-depot/"; "")), + line: ($data | .line_number), + todo: ($capture | .todo), + user: ($capture | .user), }; # Group all matches first by the user and return them in sorted order -- cgit 1.4.1