Merge pull request #84 from eshapard/master

Add support for explicit file extensions

Author: pimterry

README.md

@@ -105,6 +105,8 @@ There are also more complex options available. You can set any configuration pro
 
 Opens your `$EDITOR` of choice for a new note, with the given name. The name can include slashes, if you want to put your note in a subfolder. Leave out the name if you want one to be generated for you (e.g. `quicknote-2016-12-21.md` - format configurable with `$QUICKNOTE_FORMAT`). If you want to place a quicknote in a subfolder, use a trailing slash: `notes new subfolder/`. Shorthand alias also available with `notes n`.
 
+If you do not supply an extension in `note-name`, it will be automatically appended with the default file extension (e.g. "newnote" will become "newnote.md"). However, if you include a one-to-four-letter file extension, notes will use that extension when creating the file (e.g. "newnote.tex" is created as "newnote.tex"; not "newnote.md", or "newnote.tex.md").
+
 ### `notes find <part-of-a-note-name>`
 
 Searches note filenames and paths for the given string, and returns every single match. If no pattern is specified, this returns every single note. Shorthand alias also available with `notes f`.
@@ -129,6 +131,8 @@ Opens your notes folder in your default configured file explorer. Shorthand alia
 
 Opens a given note in your `$EDITOR`. Name can be an absolute path, or a relative path in your notes (.md suffix optional). Shorthand alias also available with `notes o`.
 
+If no file-suffix is given in `note-name`, the notes will attempt to open `note-name.md` (or whatever your default suffix is set to). However, if the note-name is given an suffix, the default suffix will not be appended (e.g. `notes open note-name.txt` will open `note-name.txt`; not `note-name.md` or `note-name.txt.md`).
+
 ### `notes mv <note-name> <destination>|<directory>`
 
 Renames a given note to destination or moves the note to directory. Name can be an absolute path, or a relative path in your notes (.md suffix optional). Destination and directory have to be a relative path in your notes.

notes

@@ -151,7 +151,8 @@ remove_note() {
     local note_name="$*"
     local to_remove="$notes_dir/$note_name"
 
-    if [ -f "$notes_dir/$note_name.$NOTES_EXT" ]; then
+    if [ ! -f "$to_remove" ] && [ -f "$notes_dir/$note_name.$NOTES_EXT" ]; then
+        # append default extension only if no file exists with exact filename given
         to_remove="$notes_dir/$note_name.$NOTES_EXT"
     fi
     rm "${rm_args[@]}" "$to_remove"
@@ -173,10 +174,19 @@ handle_multiple_notes() {
 get_full_note_path() {
     local note_path=$1
 
-    if [[ "$note_path" != *.$NOTES_EXT ]]; then
-        note_path="$note_path.$NOTES_EXT"
-    fi
-    if [ ! -f "$note_path" ]; then
+    # first check if file exists
+    if [ -f "$note_path" ]; then # note path given is good absolute or relative path
+        note_path="$note_path"
+    elif [ -f "$notes_dir/$note_path" ]; then # exists in notes_dir
+        note_path="$notes_dir/$note_path"
+    elif [ -f "$notes_dir/$note_path.$NOTES_EXT" ]; then # note with this name and default extension exists
+        note_path="$notes_dir/$note_path.$NOTES_EXT"
+    elif echo "$note_path" | grep '[.][A-Za-z]\{1,4\}$' &>/dev/null; then # given name has a 1-4 letter extension
+        note_path="$notes_dir/$note_path"
+    else
+        if [[ "$note_path" != *.$NOTES_EXT ]]; then
+            note_path="$note_path.$NOTES_EXT"
+        fi
         note_path="$notes_dir/$note_path"
     fi
 

test/test-new.bats

@@ -79,3 +79,10 @@ notes="./notes"
   assert_success
   assert_exists "$NOTES_DIRECTORY/subfolder/quicknote-$today.md"
 }
+
+@test "Should use explicitly named file extensions" {
+  run $notes new explicit-ext.zzz
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/explicit-ext.zzz"
+}

test/test-open.bats

@@ -123,3 +123,12 @@ notes="./notes"
   assert_failure
   assert_output "Please set \$EDITOR to edit notes"
 }
+
+@test "Accepts names with other file extensions to open" {
+  touch $NOTES_DIRECTORY/test-note.txt
+
+  run bash -c "$notes open test-note.txt"
+
+  assert_success
+  assert_output "Editing $NOTES_DIRECTORY/test-note.txt"
+}