List matching items when only --not query is present in search.

refs xwmxgh-247
goodevilgenius · Apr 28, 2023 · dab8013 · dab8013
1 parent eccb10b
commit dab8013
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/nb b/nb
@@ -16784,7 +16784,7 @@ _search() {
     return 0
   fi
 
-  if [[ -z "${_and_queries[*]:-}" ]]
+  if [[ -z "${_and_queries[*]:-}" ]] && [[ -z "${_not_queries[*]:-}" ]]
   then
     _exit_1 _help "search"
   fi
@@ -16817,6 +16817,12 @@ _search() {
   local _query=
   _query="$(_join "|" "${_queries[@]:-}")"
 
+  if [[ -z "${_query:-}"          ]] &&
+     [[ -n "${_not_queries[*]:-}" ]]
+  then
+    _only_list=1
+  fi
+
   {
     local __target_path=
     for   __target_path in "${_target_paths[@]:-}"
@@ -17043,7 +17049,7 @@ _search() {
             _search_paths+=("${__target_path%\/*}/.index")
           fi
 
-          if [[ "${#_queries[@]}"   -le 1 ]]
+          if [[ "${#_queries[@]}" == 1 ]]
           then
             GIT_PAGER='' git -C "${_notebook_path}"     \
               grep                                      \

diff --git a/test/search-logic.bats b/test/search-logic.bats
@@ -47,6 +47,41 @@ _setup_search() {
 
 # --not option ################################################################
 
+@test "'search --not <query>' lists items NOT matchin query, omitting content." {
+  {
+    "${_NB}" init
+
+    "${_NB}" add  "File One.md"   \
+      --title     "Title One"     \
+      --content   "Sample Content One Sample Phrase Alpha."
+
+    "${_NB}" add  "File Two.md"   \
+      --title     "Title Two"     \
+      --content   "Example Content Two Example Phrase Beta."
+
+    "${_NB}" add  "File Three.md" \
+      --title     "Title Three"   \
+      --content   "Example Content Three Example Phrase Alpha."
+
+    "${_NB}" add  "File Four.md"  \
+      --title     "Title Four"    \
+      --content   "Example Content Four Example Phrase Beta."
+  }
+
+  run "${_NB}" search --not "example"
+
+  printf "\${status}:     '%s'\\n" "${status}"
+  printf "\${output}:     '%s'\\n" "${output}"
+  printf "\${#lines[@]}:  '%s'\\n" "${#lines[@]}"
+
+  [[    "${status}"     -eq 0                                                 ]]
+
+  [[    "${#lines[@]}"  -eq 1                                                 ]]
+
+  [[    "${lines[0]}"   =~ [.*1.*].*\ Title\ One                              ]]
+  [[ -z "${lines[1]}"                                                         ]]
+}
+
 @test "'search --and <query1> --and <query2> --not <query3>' lists items matching query1 AND query2 and NOT query3." {
   {
     "${_NB}" init