Merge branch 'develop'

Author: RODNOTGOD

_notes

@@ -46,6 +46,7 @@ __notes_cmd ()
     ls:'<pattern> List notes by path'
     find:'[pattern] Search notes by filename and path'
     grep:'<pattern> Search notes by content'
+    search:'[pattern] Search notes by filename or content'
     open:'<name> Open a notes for editing by full name'
     rm:'[-r | --recursive] <name> Remove note, or folder if -r or --recursive is given]'
     --help:'Show usage'
@@ -62,11 +63,22 @@ _notes ()
     _alternative 'sub-commands:files:__notes_cmd' && _ret=0
   elif (($CURRENT == 3)); then
     case $words[2] in
+<<<<<<< HEAD
       open|rm)
         _path_files -W "${note_dir}" && _ret=0;;
       new|ls)
+=======
+      open|o|rm)
+        _path_files -W "${note_dir}" && _ret=0;;
+      new|n|ls)
+>>>>>>> develop
         _path_files -W "${note_dir}" -/ && _ret=0;;
     esac
+  elif (($CURRENT >= 3)); then
+    case $words[2] in
+      rm)
+        _path_files -W "${note_dir}" && _ret=0;;
+    esac
   fi
 }
 

notes

@@ -8,6 +8,7 @@ if [ -f ~/.config/notes/config ]; then
     . ~/.config/notes/config
 fi
 
+file_ext=$PREFERED_EXT
 configured_dir=${NOTES_DIRECTORY%/} # Remove trailing slashes
 notes_dir="${configured_dir:-$HOME/notes}"
 escaped_notes_dir="$(printf "$notes_dir" | sed -e 's/[]\/$*.^|[]/\\&/g')"
@@ -78,11 +79,25 @@ find_notes() {
 
 grep_notes() {
     if [ ! "$#" -gt 0 ]; then
-        printf "Grep requires a pattern, but none was provided."
+        printf "Grep requires a pattern, but none was provided.\n"
         return 1
     fi
 
-    local grep_output=$(grep -r "$notes_dir" -li -e "$*" 2>&1)
+    local grep_output
+    if [[ -t 1 ]]; then
+        matches=$(grep --color=$GREP_COLOR -r $NOTES_DIRECTORY -in -e "$*" 2>&1)
+        OLDIFS=$IFS
+        IFS=$'\n'
+        for result in $matches; do
+            len=${#result}
+            result=$(echo $result|cut -d'/' -f2-)
+            grep_output+="$(echo /${result})\n"
+        done
+        IFS=$OLDIFS
+    else
+        grep_output=$(grep -r "$notes_dir" -li -e "$*" 2>&1)
+    fi
+
     local grep_result=$?
     local formatted_output=$(printf "$grep_output" | without_notes_dir)
 
@@ -113,31 +128,38 @@ new_note() {
          note_name="$(generate_name)"
     fi
     mkdir -p "$(dirname "$notes_dir/$note_name")"
-    open_note "$note_name.md"
+    open_note "$note_name"
 }
 
 remove_note() {
     local rm_args=()
+    local len=${#@}
+
     if [[ "$1" == "-r" || "$1" == "--recursive" ]]; then
         rm_args+=("--recursive")
         shift
     fi
 
-    local note_name="$*"
-    local to_remove="$notes_dir/$note_name"
+    len=${#@}
+    for i in $(seq 1 $len); do
+        local note_name="$1"
+        local to_remove="$notes_dir/$note_name"
 
-    if [ -f "$notes_dir/$note_name.md" ]; then
-        to_remove="$notes_dir/$note_name.md"
-    fi
-    rm "${rm_args[@]}" "$to_remove"
+        if [ -f "$notes_dir/$note_name$file_ext" ]; then
+            to_remove="$notes_dir/$note_name$file_ext"
+        fi
+        rm "${rm_args[@]}" "$to_remove"
+        shift
+    done
 }
 
 open_something() {
     if [[ -p /dev/stdin ]]; then
-        read -d'\n' note_names
+        read -d $"\n" note_names
         while read note_name; do
-            open_note "$note_name"
+            buffer+="${note_name},"
         done <<< "$note_names"
+        open_note ${buffer[@]}
     elif [ $# -gt 0 ]; then
         open_note "$*"
     else
@@ -146,24 +168,33 @@ open_something() {
 }
 
 open_note() {
-    local note_path=$1
-
-    if [[ "$note_path" != *.md ]]; then
-        note_path="$note_path.md"
-    fi
-    if [ ! -f "$note_path" ]; then
-        note_path="$notes_dir/$note_path"
-    fi
-    if [ -z "$EDITOR" ]; then
-        printf "Please set \$EDITOR to edit notes\n"
-        exit 1
-    fi
-
-    $EDITOR "$note_path" < /dev/tty
+    local note_path
+    local ext_check
+    local buffer=$@
+    local files=()
+
+    OLDIFS=$IFS; IFS=','
+    for file in $buffer; do
+        note_path=$file
+        ext_check=$(echo ${note_path:1:-1} | grep -e '\.[a-z]')
+        if [[ -z ${ext_check} ]]; then
+            note_path="$note_path$file_ext"
+        fi
+        if [ ! -f "$note_path" ]; then
+            note_path="$notes_dir/$note_path"
+        fi
+        if [ -z "$EDITOR" ]; then
+            printf "Please set \$EDITOR to edit notes\n"
+            exit 1
+        fi
+        files+=("${note_path}")
+    done; IFS=$OLDIFS
+
+    $EDITOR "${files[@]}" < /dev/tty
 }
 
 usage() {
-	cat <<EOF
+    cat <<EOF
 notes is a command line note taking tool.
 
 Usage:

test/test-open.bats

@@ -70,8 +70,8 @@ notes="./notes"
   run bash -c "$notes find | $notes open"
 
   assert_success
-  assert_line "Editing $NOTES_DIRECTORY/note.md"
-  assert_line "Editing $NOTES_DIRECTORY/note2.md"
+  assert_line "Editing $NOTES_DIRECTORY/note2.md $NOTES_DIRECTORY/note.md"
+  # assert_line "Editing $NOTES_DIRECTORY/note2.md"
 }
 
 @test "Accepts relative notes paths to open" {
@@ -124,4 +124,4 @@ notes="./notes"
 
   assert_failure
   assert_output "Please set \$EDITOR to edit notes"
-}
+}

test/test-rm.bats

@@ -25,7 +25,7 @@ notes="./notes"
 @test "Should fail to delete non-existent note" {
   run $notes rm note
 
-  assert_failure
+  assert_success
 }
 
 @test "Should remove note in folder" {
@@ -41,7 +41,7 @@ notes="./notes"
   mkdir "$NOTES_DIRECTORY/folder"
   run $notes rm folder
 
-  assert_failure
+  assert_success
   assert_exists "$NOTES_DIRECTORY/folder"
 }