Clean notes program

Author: RODNOTGOD

_notes

@@ -1,30 +1,5 @@
 #compdef notes
 # ------------------------------------------------------------------------------
-# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the zsh-users nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ------------------------------------------------------------------------------
 # Description
 # -----------
 #
@@ -63,15 +38,9 @@ _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
@@ -81,11 +50,3 @@ _notes ()
     esac
   fi
 }
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 2
-# indent-tabs-mode: nil
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et

notes

@@ -8,7 +8,6 @@ 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')"
@@ -79,25 +78,11 @@ find_notes() {
 
 grep_notes() {
     if [ ! "$#" -gt 0 ]; then
-        printf "Grep requires a pattern, but none was provided.\n"
+        printf "Grep requires a pattern, but none was provided."
         return 1
     fi
 
-    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_output=$(grep -r "$notes_dir" -li -e "$*" 2>&1)
     local grep_result=$?
     local formatted_output=$(printf "$grep_output" | without_notes_dir)
 
@@ -128,38 +113,31 @@ new_note() {
          note_name="$(generate_name)"
     fi
     mkdir -p "$(dirname "$notes_dir/$note_name")"
-    open_note "$note_name"
+    open_note "$note_name.$NOTES_EXT"
 }
 
 remove_note() {
     local rm_args=()
-    local len=${#@}
-
     if [[ "$1" == "-r" || "$1" == "--recursive" ]]; then
         rm_args+=("--recursive")
         shift
     fi
 
-    len=${#@}
-    for i in $(seq 1 $len); do
-        local note_name="$1"
-        local to_remove="$notes_dir/$note_name"
+    local note_name="$*"
+    local to_remove="$notes_dir/$note_name"
 
-        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
+    if [ -f "$notes_dir/$note_name.$NOTES_EXT" ]; then
+        to_remove="$notes_dir/$note_name.$NOTES_EXT"
+    fi
+    rm "${rm_args[@]}" "$to_remove"
 }
 
 open_something() {
     if [[ -p /dev/stdin ]]; then
-        read -d $"\n" note_names
+        read -d'\n' note_names
         while read note_name; do
-            buffer+="${note_name},"
+            open_note "$note_name"
         done <<< "$note_names"
-        open_note ${buffer[@]}
     elif [ $# -gt 0 ]; then
         open_note "$*"
     else
@@ -168,33 +146,24 @@ open_something() {
 }
 
 open_note() {
-    local note_path
-    local ext_check
-    local buffer=$@
-    local files=()
+    local note_path=$1
 
-    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
+    if [[ "$note_path" != *.$NOTES_EXT ]]; then
+        note_path="$note_path.$NOTES_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
 
-    $EDITOR "${files[@]}" < /dev/tty
+    $EDITOR "$note_path" < /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/note2.md $NOTES_DIRECTORY/note.md"
-  # assert_line "Editing $NOTES_DIRECTORY/note2.md"
+  assert_line "Editing $NOTES_DIRECTORY/note.md"
+  assert_line "Editing $NOTES_DIRECTORY/note2.md"
 }
 
 @test "Accepts relative notes paths to open" {

test/test-rm.bats

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