Add todo tag filtering with #hashtag argument.

refs gh-294
xwmx · Feb 8, 2024 · ce268eb · ce268eb
1 parent d65169d
commit ce268eb
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 7 deletions.
diff --git a/nb b/nb
@@ -25374,17 +25374,22 @@ _todo() {
 
         shift
         ;;
-      --tag*)
+      --tag*|\#*)
         [[ -n "${_tag_list_with_commas:-}"  ]] && _tag_list_with_commas+=","
-        _tag_list_with_commas+="$(_option_get_tags "${1}" "${2:-}")"
-
         [[ -n "${_tag_list_with_spaces:-}"  ]] && _tag_list_with_spaces+=" "
 
-        _tag_list_with_spaces+="$(_option_get_tags "${1}" "${2:-}")"
-
-        _tags+=("${2:-}")
+        if [[ "${1:-}" =~ ^-- ]]
+        then
+          _tag_list_with_commas+="$(_option_get_tags "${1}" "${2:-}")"
+          _tag_list_with_spaces+="$(_option_get_tags "${1}" "${2:-}")"
+          _tags+=("${2:-}")
 
-        shift
+          shift
+        else
+          _tag_list_with_commas+="${1:-}"
+          _tag_list_with_spaces+="${1:-}"
+          _tags+=("${1:-}")
+        fi
         ;;
       --task)
         _tasks+=("$(_option_get_value "${1:-}" "${2:-}")")

diff --git a/test/todo.bats b/test/todo.bats
@@ -123,6 +123,8 @@ load test_helper
 .*\[.*Example\ Notebook:Example\ Folder/1.*\].*\ ✔️\ \ .*\[\ \].*\ Example\ todo\ description\ one\.     ]]
 }
 
+# tags ########################################################################
+
 @test "'todos --tags <tag>' exits with 0 and lists todos containing <tag>." {
   {
     "${_NB}" init
@@ -165,6 +167,48 @@ load test_helper
 .*\[.*2.*\].*\ ✔️\ \ .*\[\ \].*\ Example\ todo\ description\ two\.     ]]
 }
 
+@test "'todos <tag>' exits with 0 and lists todos containing <tag>." {
+  {
+    "${_NB}" init
+
+    "${_NB}" add                                                                            \
+      --content   "# [ ] Example todo description one.${_NEWLINE}${_NEWLINE}#sample-tag"    \
+      --filename  "One.todo.md"
+
+    sleep 1
+
+    "${_NB}" add                                                                            \
+      --content   "# [ ] Example todo description two.${_NEWLINE}${_NEWLINE}#example-tag"   \
+      --filename  "Two.todo.md"
+
+    sleep 1
+
+    "${_NB}" add                                                                            \
+      --content   "# [x] Example todo description three.${_NEWLINE}${_NEWLINE}example-tag"  \
+      --filename  "Three.todo.md"
+
+    sleep 1
+
+    "${_NB}" add                                                                            \
+      --content   "# Example description four.${_NEWLINE}${_NEWLINE}#example-tag"           \
+      --filename  "Four.md"
+  }
+
+  run "${_NB}" todos \#example-tag
+
+  printf "\${status}: '%s'\\n" "${status}"
+  printf "\${output}: '%s'\\n" "${output}"
+
+  [[    "${status}"   -eq 0     ]]
+
+  [[ !  "${output}"   =~  one   ]]
+  [[ !  "${output}"   =~  three ]]
+  [[ !  "${output}"   =~  four  ]]
+
+  [[    "${lines[0]}" =~  \
+.*\[.*2.*\].*\ ✔️\ \ .*\[\ \].*\ Example\ todo\ description\ two\.     ]]
+}
+
 # todos closed / done #########################################################
 
 @test "'todos closed <notebook>:<folder>/' exits with 0 and lists todos." {