Simplified check for done task.

Use simple comparison with slice of string (already used e.g. in _list()) instead of grep -c pipeline.

Makefile

@@ -13,7 +13,7 @@ VERSION-FILE: .FORCE-VERSION-FILE
 todo.sh: VERSION-FILE
 
 # For packaging
-DISTFILES := todo.cfg todo_completion
+DISTFILES := todo.cfg
 
 DISTNAME=todo.txt_cli-$(VERSION)
 dist: $(DISTFILES) todo.sh

tests/t0100-code-nobacktick.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-test_description='no old-style backtick command substitution
-
-This test checks the todo.sh script itself for occurrences
-of old-style backtick command substitution, which should be
-replaced with $(...).
-On failure, it will print each offending line number and line.
-'
-. ./test-lib.sh
-
-test_todo_session 'no old-style backtick command substitution' <<EOF
->>> sed -n -e 's/\(^\|[ \t]\)#.*//' -e '/\`/{' -e '=;p' -e '}' "$(which todo.sh)"
-EOF
-
-test_done

tests/t1000-addlist.sh

@@ -77,37 +77,4 @@ TODO: 5 added.
 TODO: 5 of 5 tasks shown
 EOF
 
-#
-# Advanced add
-#
-
-cat /dev/null > todo.txt
-test_todo_session 'add with spaces' <<EOF
->>> todo.sh add "notice the   three   spaces"
-1 notice the   three   spaces
-TODO: 1 added.
-
->>> todo.sh add notice how the   spaces    get lost
-2 notice how the spaces get lost
-TODO: 2 added.
-
->>> todo.sh list
-2 notice how the spaces get lost
-1 notice the   three   spaces
---
-TODO: 2 of 2 tasks shown
-EOF
-
-cat /dev/null > todo.txt
-test_todo_session 'add with CR' <<EOF
->>> todo.sh add "smell the
-Carriage Return"
-1 smell the Carriage Return
-TODO: 1 added.
-
->>> todo.sh list
-1 smell the Carriage Return
---
-TODO: 1 of 1 tasks shown
-EOF
 test_done

tests/t1010-add-date.sh

@@ -21,22 +21,6 @@ TODO: 1 added.
 TODO: 1 of 1 tasks shown
 EOF
 
-test_todo_session 'cmd line first day with priority' <<EOF
->>> todo.sh -pt add '(A) notice the daisies'
-2 (A) 2009-02-13 notice the daisies
-TODO: 2 added.
-
->>> todo.sh -p list
-2 (A) 2009-02-13 notice the daisies
-1 2009-02-13 notice the daisies
---
-TODO: 2 of 2 tasks shown
-
->>> todo.sh -npf del 2
-2 (A) 2009-02-13 notice the daisies
-TODO: 2 deleted.
-EOF
-
 test_tick
 
 test_todo_session 'cmd line second day' <<EOF

tests/t1020-addtolistfile.sh

@@ -39,24 +39,6 @@ GARDEN: 2 added.
 GARDEN: 2 of 2 tasks shown
 EOF
 
-#
-# List available files
-#
-test_todo_session 'list available files' <<EOF
->>> todo.sh listfile
-Files in the todo.txt directory:
-done.txt
-garden.txt
-report.txt
-todo.txt
-
->>> TODOTXT_VERBOSE=0 todo.sh listfile
-done.txt
-garden.txt
-report.txt
-todo.txt
-EOF
-
 #
 # Filter
 #

tests/t1100-replace.sh

@@ -45,12 +45,6 @@ grow some corn
 thrash some hay
 chase the chickens
 EOF
-test_todo_session 'replace error' << EOF
->>> todo.sh replace 10 "hej!"
-=== 1
-TODO: No task 10.
-EOF
-
 test_todo_session 'replace in multi-item file' <<EOF
 >>> todo.sh replace 1 smell the cheese
 1 smell the cows
@@ -68,59 +62,33 @@ TODO: Replaced task with:
 4 collect the eggs
 EOF
 
-echo '(A) collect the eggs' > todo.txt
 test_todo_session 'replace with priority' <<EOF
->>> todo.sh replace 1 "collect the bread"
+>>> todo.sh pri 4 a
-1 (A) collect the eggs
+4 (A) collect the eggs
-TODO: Replaced task with:
+TODO: 4 prioritized (A).
-1 (A) collect the bread
 
->>> todo.sh replace 1 collect the eggs
+>>> todo.sh replace 4 "collect the bread"
-1 (A) collect the bread
+4 (A) collect the eggs
 TODO: Replaced task with:
-1 (A) collect the eggs
+4 (A) collect the bread
+
+>>> todo.sh replace 4 collect the eggs
+4 (A) collect the bread
+TODO: Replaced task with:
+4 (A) collect the eggs
 EOF
 
-echo 'jump on hay' > todo.txt
 test_todo_session 'replace with &' << EOF
->>> todo.sh replace 1 "thrash the hay & thrash the wheat"
+>>> todo.sh replace 3 "thrash the hay & thresh the wheat"
-1 jump on hay
+3 jump on hay
 TODO: Replaced task with:
-1 thrash the hay & thrash the wheat
+3 thrash the hay & thresh the wheat
 EOF
 
-echo 'jump on hay' > todo.txt
+test_todo_session 'replace error' << EOF
-test_todo_session 'replace with spaces' <<EOF
+>>> todo.sh replace 10 "hej!"
->>> todo.sh replace 1 "notice the   three   spaces"
+=== 1
-1 jump on hay
+TODO: No task 10.
-TODO: Replaced task with:
-1 notice the   three   spaces
-EOF
-
-cat > todo.txt <<EOF
-smell the cows
-grow some corn
-thrash some hay
-chase the chickens
-EOF
-test_todo_session 'replace with symbols' <<EOF
->>> todo.sh replace 1 "~@#$%^&*()-_=+[{]}|;:',<.>/?"
-1 smell the cows
-TODO: Replaced task with:
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/?
-
->>> todo.sh replace 2 '\`!\\"'
-2 grow some corn
-TODO: Replaced task with:
-2 \`!\\"
-
->>> todo.sh list
-4 chase the chickens
-3 thrash some hay
-2 \`!\\"
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/?
---
-TODO: 4 of 4 tasks shown
 EOF
 
 cat /dev/null > todo.txt
@@ -156,7 +124,6 @@ TODO: Replaced task with:
 1 (A) 2009-02-13 this is just a new one
 EOF
 
-echo '(A) 2009-02-13 this is just a new one' > todo.txt
 test_todo_session 'replace with prepended date replaces existing date' <<EOF
 >>> todo.sh replace 1 2010-07-04 this also has a new date
 1 (A) 2009-02-13 this is just a new one

tests/t1200-pri.sh

@@ -53,34 +53,9 @@ TODO: 2 prioritized (C).
 --
 TODO: 3 of 3 tasks shown
 
->>> todo.sh add "smell the coffee +wakeup"
-4 smell the coffee +wakeup
-TODO: 4 added.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
-4 smell the coffee +wakeup
-3 stop
---
-TODO: 4 of 4 tasks shown
-EOF
-
-test_todo_session 'priority error' <<EOF
->>> todo.sh pri 10 B
-=== 1
-TODO: No task 10.
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(C) notice the sunflowers
-stop
-EOF
-test_todo_session 'reprioritize' <<EOF
 >>> todo.sh pri 2 A
 2 (A) notice the sunflowers
-TODO: 2 re-prioritized from (C) to (A).
+TODO: 2 prioritized (A).
 
 >>> todo.sh -p list
 2 (A) notice the sunflowers
@@ -91,13 +66,25 @@ TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 a
 2 (A) notice the sunflowers
-TODO: 2 already prioritized (A).
+TODO: 2 prioritized (A).
+
+>>> todo.sh -p listpri
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+--
+TODO: 2 of 3 tasks shown
+
+>>> todo.sh add "smell the coffee +wakeup"
+4 smell the coffee +wakeup
+TODO: 4 added.
 
 >>> todo.sh -p list
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
+4 smell the coffee +wakeup
 3 stop
 --
-TODO: 3 of 3 tasks shown
+TODO: 4 of 4 tasks shown
 EOF
+
 test_done

tests/t1250-listpri.sh

@@ -1,95 +0,0 @@
-#!/bin/sh
-
-test_description='list priority functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(C) notice the sunflowers
-stop
-EOF
-test_todo_session 'basic listpri' <<EOF
->>> todo.sh listpri A
---
-TODO: 0 of 3 tasks shown
-
->>> todo.sh -p listpri c
-2 (C) notice the sunflowers
---
-TODO: 1 of 3 tasks shown
-EOF
-
-test_todo_session 'listpri highlighting' <<EOF
->>> todo.sh listpri
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
---
-TODO: 2 of 3 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(C) notice the sunflowers
-(m)others will notice this
-(n) not a prioritized task
-notice the (C)opyright
-EOF
-test_todo_session 'listpri filtering priorities' <<EOF
->>> todo.sh -p listpri
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
---
-TODO: 2 of 5 tasks shown
-
->>> todo.sh -p listpri b
-1 (B) smell the uppercase Roses +flowers @outside
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh -p listpri c
-2 (C) notice the sunflowers
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh -p listpri m
---
-TODO: 0 of 5 tasks shown
-
->>> todo.sh -p listpri n
---
-TODO: 0 of 5 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-(B) ccc xxx this line should be third.
-ccc xxx this line should be third.
-(A) aaa zzz this line should be first.
-aaa zzz this line should be first.
-(B) bbb yyy this line should be second.
-bbb yyy this line should be second.
-EOF
-test_todo_session 'listpri filtering of TERM' <<EOF
->>> todo.sh -p listpri "should be"
-3 (A) aaa zzz this line should be first.
-5 (B) bbb yyy this line should be second.
-1 (B) ccc xxx this line should be third.
---
-TODO: 3 of 6 tasks shown
-
->>> todo.sh -p listpri a "should be"
-3 (A) aaa zzz this line should be first.
---
-TODO: 1 of 6 tasks shown
-
->>> todo.sh -p listpri b second
-5 (B) bbb yyy this line should be second.
---
-TODO: 1 of 6 tasks shown
-
->>> todo.sh -p listpri x "should be"
---
-TODO: 0 of 6 tasks shown
-EOF
-
-test_done

tests/t1260-listprj.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-test_description='list project functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +roses @outside +shared
-(C) notice the sunflowers +sunflowers @garden +shared +landscape
-stop
-EOF
-test_todo_session 'basic listproj' <<EOF
->>> todo.sh listproj
-+landscape
-+roses
-+shared
-+sunflowers
-EOF
-
-test_todo_session 'listproj with context' <<EOF
->>> todo.sh listproj @garden
-+landscape
-+shared
-+sunflowers
-EOF
-
-TEST_TODO_CUSTOM=todo-custom.cfg
-cat todo.cfg > "$TEST_TODO_CUSTOM"
-cat >> "$TEST_TODO_CUSTOM" <<'EOF'
-export DEFAULT='</color>'
-export PRI_B='<color type=green>'
-export PRI_C='<color type=blue>'
-export TODOTXT_FINAL_FILTER='grep -i roses'
-EOF
-test_todo_session 'listproj with context special cases' <<EOF
->>> todo.sh -+ -d "$TEST_TODO_CUSTOM" listproj @garden
-+landscape
-+shared
-+sunflowers
-EOF
-
-test_done

tests/t1300-ls.sh

@@ -73,29 +73,6 @@ TODO: 1 of 3 tasks shown
 TODO: 1 of 3 tasks shown
 EOF
 
-#
-# check negative filtering via -TERM
-#
-test_todo_session 'checking negative filtering via -TERM' <<EOF
->>> todo.sh ls -second
-2 aaa zzz this line should be first.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-
->>> todo.sh ls "-should be f"
-3 bbb yyy this line should be second.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-
->>> todo.sh ls "- zzz"
-3 bbb yyy this line should be second.
-1 ccc xxx this line should be third.
---
-TODO: 2 of 3 tasks shown
-EOF
-
 #
 # check the filtering of TERM with regexp
 #
@@ -117,40 +94,6 @@ TODO: 1 of 3 tasks shown
 TODO: 1 of 3 tasks shown
 EOF
 
-#
-# check the filtering of TERM containing characters that are special to the
-# shell, like variables, quotes, and multiple subsequent spaces.
-#
-cat > todo.txt <<'EOF'
-earn some pennies
-earn some $$
-earn some "money"
-get money from O'Brian
-just get   money!
-EOF
-test_todo_session 'checking filtering of special characters' <<'EOF'
->>> todo.sh ls '$$'
-2 earn some $$
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh ls '"money"'
-3 earn some "money"
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh ls "O'Brian"
-4 get money from O'Brian
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh ls "get   money"
-5 just get   money!
---
-TODO: 1 of 5 tasks shown
-EOF
-
-
 #
 # check the x command line option
 #
@@ -199,7 +142,7 @@ cat > todo.txt <<EOF
 (D) @con02 +prj03 -- Some project 03 task, pri D
 (D) @con02 +prj04 -- Some project 04 task, pri D
 @con01 +prj01 -- Some project 01 task, no priority
-@con01 +prj02 -- Some project(S) 02 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
 @con02 +prj03 -- Some project 03 task, no priorty
 @con02 +prj04 -- Some project 04 task, no priority
 EOF
@@ -222,7 +165,7 @@ test_todo_session 'plain mode option' <<EOF
 15 (D) @con02 +prj03 -- Some project 03 task, pri D
 16 (D) @con02 +prj04 -- Some project 04 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
@@ -246,7 +189,7 @@ TODO: 20 of 20 tasks shown
 15 (D) @con02 +prj03 -- Some project 03 task, pri D
 16 (D) @con02 +prj04 -- Some project 04 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
@@ -274,7 +217,7 @@ cat > todo.txt <<EOF
 (D) @con02 +prj03 -- Some project 03 task, pri D
 (D) @con02 +prj04 -- Some project 04 task, pri D
 @con01 +prj01 -- Some project 01 task, no priority
-@con01 +prj02 -- Some project(S) 02 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
 @con02 +prj03 -- Some project 03 task, no priorty
 @con02 +prj04 -- Some project 04 task, no priority
 EOF
@@ -297,7 +240,7 @@ test_todo_session 'context, project, and priority suppression' <<EOF
 15 (D) @con02 +prj03 -- Some project 03 task, pri D
 16 (D) @con02 +prj04 -- Some project 04 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
@@ -313,7 +256,7 @@ TODO: 20 of 20 tasks shown
 13 (D) @con01 +prj01 -- Some project 01 task, pri D
 14 (D) @con01 +prj02 -- Some project 02 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -327,7 +270,7 @@ TODO: 10 of 20 tasks shown
 13 @con01 +prj01 -- Some project 01 task, pri D
 14 @con01 +prj02 -- Some project 02 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -341,7 +284,7 @@ TODO: 10 of 20 tasks shown
 13 (D) @con01 -- Some project 01 task, pri D
 14 (D) @con01 -- Some project 02 task, pri D
 17 @con01 -- Some project 01 task, no priority
-18 @con01 -- Some project(S) 02 task, no priority
+18 @con01 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -355,7 +298,7 @@ TODO: 10 of 20 tasks shown
 13 (D) +prj01 -- Some project 01 task, pri D
 14 (D) +prj02 -- Some project 02 task, pri D
 17 +prj01 -- Some project 01 task, no priority
-18 +prj02 -- Some project(S) 02 task, no priority
+18 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -369,7 +312,7 @@ TODO: 10 of 20 tasks shown
 13 +prj01 -- Some project 01 task, pri D
 14 +prj02 -- Some project 02 task, pri D
 17 +prj01 -- Some project 01 task, no priority
-18 +prj02 -- Some project(S) 02 task, no priority
+18 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -383,7 +326,7 @@ TODO: 10 of 20 tasks shown
 13 (D) @con01 +prj01 -- Some project 01 task, pri D
 14 (D) @con01 +prj02 -- Some project 02 task, pri D
 17 @con01 +prj01 -- Some project 01 task, no priority
-18 @con01 +prj02 -- Some project(S) 02 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 
@@ -397,7 +340,7 @@ TODO: 10 of 20 tasks shown
 13 -- Some project 01 task, pri D
 14 -- Some project 02 task, pri D
 17 -- Some project 01 task, no priority
-18 -- Some project(S) 02 task, no priority
+18 -- Some project 02 task, no priority
 --
 TODO: 10 of 20 tasks shown
 EOF

tests/t1330-ls-highlighting.sh

@@ -166,20 +166,4 @@ test_todo_session 'highlighting with hidden contexts/projects' <<EOF
 TODO: 4 of 4 tasks shown
 EOF
 
-# check that priorities are only matched at the start of the task
-#
-cat > todo.txt <<EOF
-(D) some prioritized task
-not prioritized
-should not be seen as PRIORITIZE(D) task
-EOF
-test_todo_session 'highlighting priority position' <<EOF
->>> todo.sh ls
-1 (D) some prioritized task
-2 not prioritized
-3 should not be seen as PRIORITIZE(D) task
---
-TODO: 3 of 3 tasks shown
-EOF
-
 test_done

tests/t1400-prepend.sh

@@ -57,34 +57,6 @@ test_todo_session 'prepend with &' <<EOF
 3 no running & jumping now stop
 EOF
 
-echo 'jump on hay' > todo.txt
-test_todo_session 'prepend with spaces' <<EOF
->>> todo.sh prepend 1 "notice the   three   spaces and"
-1 notice the   three   spaces and jump on hay
-EOF
-
-cat > todo.txt <<EOF
-smell the cows
-grow some corn
-thrash some hay
-chase the chickens
-EOF
-test_todo_session 'prepend with symbols' <<EOF
->>> todo.sh prepend 1 "~@#$%^&*()-_=+[{]}|;:',<.>/?"
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/? smell the cows
-
->>> todo.sh prepend 2 '\`!\\"'
-2 \`!\\" grow some corn
-
->>> todo.sh list
-4 chase the chickens
-3 thrash some hay
-2 \`!\\" grow some corn
-1 ~@#$%^&*()-_=+[{]}|;:',<.>/? smell the cows
---
-TODO: 4 of 4 tasks shown
-EOF
-
 cat /dev/null > todo.txt
 test_todo_session 'prepend handling prepended date on add' <<EOF
 >>> todo.sh -t add "new task"

tests/t1500-do.sh

@@ -81,6 +81,6 @@ test_todo_session 'fail multiple do attempts' <<EOF
 TODO: 3 marked as done.
 
 >>> todo.sh -a do 3
-TODO: 3 is already marked done.
+3 is already marked done
 EOF
 test_done

tests/t1600-append.sh

@@ -17,12 +17,6 @@ test_todo_session 'append usage' <<EOF
 usage: todo.sh append ITEM# "TEXT TO APPEND"
 EOF
 
-test_todo_session 'append error' << EOF
->>> todo.sh append 10 "hej!"
-=== 1
-TODO: No task 10.
-EOF
-
 test_todo_session 'basic append' <<EOF
 >>> todo.sh append 1 "smell the roses"
 1 notice the daisies smell the roses
@@ -43,32 +37,11 @@ test_todo_session 'basic append with &' <<EOF
 TODO: 1 of 1 tasks shown
 EOF
 
-echo 'jump on hay' > todo.txt
-test_todo_session 'append with spaces' <<EOF
->>> todo.sh append 1 "and notice the   three   spaces"
-1 jump on hay and notice the   three   spaces
-EOF
 
-cat > todo.txt <<EOF
+test_todo_session 'append error' << EOF
-smell the cows
+>>> todo.sh append 10 "hej!"
-grow some corn
+=== 1
-thrash some hay
+TODO: No task 10.
-chase the chickens
-EOF
-test_todo_session 'append with symbols' <<EOF
->>> todo.sh append 1 "~@#$%^&*()-_=+[{]}|;:',<.>/?"
-1 smell the cows ~@#$%^&*()-_=+[{]}|;:',<.>/?
-
->>> todo.sh append 2 '\`!\\"'
-2 grow some corn \`!\\"
-
->>> todo.sh list
-4 chase the chickens
-2 grow some corn \`!\\"
-1 smell the cows ~@#$%^&*()-_=+[{]}|;:',<.>/?
-3 thrash some hay
---
-TODO: 4 of 4 tasks shown
 EOF
 
 cat > todo.txt <<EOF

tests/t1700-depri.sh

@@ -68,30 +68,4 @@ TODO: 2 deprioritized.
 TODO: 3 of 3 tasks shown
 EOF
 
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-stop
-EOF
-test_todo_session 'depriority of unprioritized task' <<EOF
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh depri 3 2
-TODO: 3 is not prioritized.
-2 notice the sunflowers
-TODO: 2 deprioritized.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
 test_done

todo.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # === HEAVY LIFTING ===
-shopt -s extglob extquote
+shopt -s extglob
 
 # NOTE:  Todo.sh requires the .todo/config configuration file to run.
 # Place the .todo/config file in your home directory or use the -d option for a custom location.
@@ -44,113 +44,39 @@ shorthelp()
 
 		  Actions:
 		    add|a "THING I NEED TO DO +project @context"
+		    addto DEST "TEXT TO ADD"
 		    addm "THINGS I NEED TO DO
 		          MORE THINGS I NEED TO DO"
-		    addto DEST "TEXT TO ADD"
 		    append|app ITEM# "TEXT TO APPEND"
 		    archive
 		    command [ACTIONS]
 		    del|rm ITEM# [TERM]
-		    depri|dp ITEM#[, ITEM#, ITEM#, ...]
+		    dp|depri ITEM#[, ITEM#, ITEM#, ...]
 		    do ITEM#[, ITEM#, ITEM#, ...]
 		    help
 		    list|ls [TERM...]
 		    listall|lsa [TERM...]
 		    listcon|lsc
-		    listfile|lf [SRC [TERM...]]
+		    listfile|lf SRC [TERM...]
-		    listpri|lsp [PRIORITY] [TERM...]
+		    listpri|lsp [PRIORITY]
-		    listproj|lsprj [TERM...]
+		    listproj|lsprj
 		    move|mv ITEM# DEST [SRC]
 		    prepend|prep ITEM# "TEXT TO PREPEND"
 		    pri|p ITEM# PRIORITY
 		    replace ITEM# "UPDATED TODO"
 		    report
-		    shorthelp
-
-	EndHelp
-
-    # Only list the one-line usage from the add-on actions. This assumes that
-    # add-ons use the same usage indentation structure as todo.sh.
-    addonHelp | grep -e '^  Add-on Actions:' -e '^    [[:alpha:]]'
-
-    cat <<-EndHelpFooter
 
 		  See "help" for more details.
-	EndHelpFooter
+	EndHelp
     exit 0
 }
 
 help()
 {
-    cat <<-EndOptionsHelp
+    cat <<-EndHelp
 		  Usage: $oneline_usage
 
-		  Options:
+		  Actions:
-		    -@
-		        Hide context names in list output.  Use twice to show context
-		        names (default).
-		    -+
-		        Hide project names in list output.  Use twice to show project
-		        names (default).
-		    -c
-		        Color mode
-		    -d CONFIG_FILE
-		        Use a configuration file other than the default ~/.todo/config
-		    -f
-		        Forces actions without confirmation or interactive input
-		    -h
-		        Display a short help message; same as action "shorthelp"
-		    -p
-		        Plain mode turns off colors
-		    -P
-		        Hide priority labels in list output.  Use twice to show
-		        priority labels (default).
-		    -a
-		        Don't auto-archive tasks automatically on completion
-		    -A
-		        Auto-archive tasks automatically on completion
-		    -n
-		        Don't preserve line numbers; automatically remove blank lines
-		        on task deletion
-		    -N
-		        Preserve line numbers
-		    -t
-		        Prepend the current date to a task automatically
-		        when it's added.
-		    -T
-		        Do not prepend the current date to a task automatically
-		        when it's added.
-		    -v
-		        Verbose mode turns on confirmation messages
-		    -vv
-		        Extra verbose mode prints some debugging information and
-		        additional help text
-		    -V
-		        Displays version, license and credits
-		    -x
-		        Disables TODOTXT_FINAL_FILTER
-
-
-	EndOptionsHelp
-
-    [ $TODOTXT_VERBOSE -gt 1 ] && cat <<-EndVerboseHelp
-		  Environment variables:
-		    TODOTXT_AUTO_ARCHIVE            is same as option -a (0)/-A (1)
-		    TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
-		    TODOTXT_FORCE=1                 is same as option -f
-		    TODOTXT_PRESERVE_LINE_NUMBERS   is same as option -n (0)/-N (1)
-		    TODOTXT_PLAIN                   is same as option -p (1)/-c (0)
-		    TODOTXT_DATE_ON_ADD             is same as option -t (1)/-T (0)
-		    TODOTXT_VERBOSE=1               is same as option -v
-		    TODOTXT_DISABLE_FILTER=1        is same as option -x
-		    TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
-		    TODOTXT_SORT_COMMAND="sort ..." customize list output
-		    TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
-
-
-	EndVerboseHelp
-    cat <<-EndActionsHelp
-		  Built-in Actions:
 		    add "THING I NEED TO DO +project @context"
 		    a "THING I NEED TO DO +project @context"
 		      Adds THING I NEED TO DO to your todo.txt file on its own line.
@@ -199,34 +125,28 @@ help()
 		    list [TERM...]
 		    ls [TERM...]
 		      Displays all tasks that contain TERM(s) sorted by priority with line
-		      numbers.  Each task must match all TERMs (logical AND); to display
+		      numbers.  If no TERM specified, lists entire todo.txt.
-		      tasks that contain any TERM (logical OR), use
-		      "TERM1\|TERM2\|..." (with quotes), or TERM1\\\|TERM2 (unquoted).
-		      If no TERM specified, lists entire todo.txt.
 
 		    listall [TERM...]
 		    lsa [TERM...]
 		      Displays all the lines in todo.txt AND done.txt that contain TERM(s)
-		      sorted by priority with line numbers.  If no TERM specified, lists
+		      sorted by priority with line  numbers.  If no TERM specified, lists
 		      entire todo.txt AND done.txt concatenated and sorted.
 
 		    listcon
 		    lsc
 		      Lists all the task contexts that start with the @ sign in todo.txt.
 
-		    listfile [SRC [TERM...]]
+		    listfile SRC [TERM...]
-		    lf [SRC [TERM...]]
+		    lf SRC [TERM...]
 		      Displays all the lines in SRC file located in the todo.txt directory,
-		      sorted by priority with line numbers.  If TERM specified, lists
+		      sorted by priority with line  numbers.  If TERM specified, lists
-		      all lines that contain TERM(s) in SRC file.
+		      all lines that contain TERM in SRC file.
-		      Without any arguments, the names of all text files in the todo.txt
-		      directory are listed.
 
-		    listpri [PRIORITY] [TERM...]
+		    listpri [PRIORITY]
-		    lsp [PRIORITY] [TERM...]
+		    lsp [PRIORITY]
 		      Displays all tasks prioritized PRIORITY.
 		      If no PRIORITY specified, lists all prioritized tasks.
-		      If TERM specified, lists only prioritized tasks that contain TERM(s).
 
 		    listproj
 		    lsprj
@@ -256,33 +176,81 @@ help()
 		    report
 		      Adds the number of open tasks and done tasks to report.txt.
 
-		    shorthelp
-		      List the one-line usage of all built-in and add-on actions.
 
 
-	EndActionsHelp
+		  Options:
+		    -@
+		        Hide context names in list output. Use twice to show context
+		        names (default).
+		    -+
+		        Hide project names in list output. Use twice to show project
+		        names (default).
+		    -c
+		        Color mode
+		    -d CONFIG_FILE
+		        Use a configuration file other than the default ~/.todo/config
+		    -f
+		        Forces actions without confirmation or interactive input
+		    -h
+		        Display a short help message
+		    -p
+		        Plain mode turns off colors
+		    -P
+		        Hide priority labels in list output. Use twice to show
+		        priority labels (default).
+		    -a
+		        Don't auto-archive tasks automatically on completion
+		    -A
+		        Auto-archive tasks automatically on completion
+		    -n
+		        Don't preserve line numbers; automatically remove blank lines
+		        on task deletion
+		    -N
+		        Preserve line numbers
+		    -t
+		        Prepend the current date to a task automatically
+		        when it's added.
+		    -T
+		        Do not prepend the current date to a task automatically
+		        when it's added.
+		    -v
+		        Verbose mode turns on confirmation messages
+		    -vv
+		        Extra verbose mode prints some debugging information
+		    -V
+		        Displays version, license and credits
+		    -x
+		        Disables TODOTXT_FINAL_FILTER
 
-        addonHelp
-    exit 1
-}
 
-addonHelp()
+		  Environment variables:
-{
+		    TODOTXT_AUTO_ARCHIVE            is same as option -a (0)/-A (1)
-    if [ -d "$TODO_ACTIONS_DIR" ]; then
+		    TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
-        didPrintAddonActionsHeader=
+		    TODOTXT_FORCE=1                 is same as option -f
+		    TODOTXT_PRESERVE_LINE_NUMBERS   is same as option -n (0)/-N (1)
+		    TODOTXT_PLAIN                   is same as option -p (1)/-c (0)
+		    TODOTXT_DATE_ON_ADD             is same as option -t (1)/-T (0)
+		    TODOTXT_VERBOSE=1               is same as option -v
+		    TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
+		    TODOTXT_SORT_COMMAND="sort ..." customize list output
+		    TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
+	EndHelp
+
+    if [ -d "$TODO_ACTIONS_DIR" ]
+    then
+        echo ""
         for action in "$TODO_ACTIONS_DIR"/*
         do
-            if [ -f "$action" -a -x "$action" ]; then
+            if [ -f "$action" -a -x "$action" ]
-                if [ ! "$didPrintAddonActionsHeader" ]; then
+            then
-                    cat <<-EndAddonActionsHeader
-		  Add-on Actions:
-	EndAddonActionsHeader
-                    didPrintAddonActionsHeader=1
-                fi
                 "$action" usage
             fi
         done
+        echo ""
     fi
+
+
+    exit 1
 }
 
 die()
@@ -299,63 +267,19 @@ cleanup()
 
 cleaninput()
 {
-    # Parameters:    When $1 = "for sed", performs additional escaping for use
+    # Cleanup the input
-    #                in sed substitution with "|" separators.
+    # Replace newlines with spaces Always
-    # Precondition:  $input contains text to be cleaned.
+    input=`echo $input | tr -d '\r\n'`
-    # Postcondition: Modifies $input.
 
-    # Replace CR and LF with space; tasks always comprise a single line.
+    action_regexp="^\(append\|app\|prepend\|prep\|replace\)$"
-    input=${input//$'\r'/ }
-    input=${input//$'\n'/ }
 
-    if [ "$1" = "for sed" ]; then
+    # Check which action we are being used in as this affects what cleaning we do
-        # This action uses sed with "|" as the substitution separator, and & as
+    if [ `echo $action | grep -c $action_regexp` -eq 1 ]; then
-        # the matched string; these must be escaped.
+        # These actions use sed and & as the matched string so escape it
-        # Backslashes must be escaped, too, and before the other stuff.
+        input=`echo $input | sed 's/\&/\\\&/g'`
-        input=${input//\\/\\\\}
-        input=${input//|/\\|}
-        input=${input//&/\\&}
     fi
 }
 
-getPrefix()
-{
-    # Parameters:    $1: todo file; empty means $TODO_FILE.
-    # Returns:       Uppercase FILE prefix to be used in place of "TODO:" where
-    #                a different todo file can be specified.
-    local base=$(basename "${1:-$TODO_FILE}")
-    echo "${base%%.[^.]*}" | tr 'a-z' 'A-Z'
-}
-
-getTodo()
-{
-    # Parameters:    $1: task number
-    #                $2: Optional todo file
-    # Precondition:  $errmsg contains usage message.
-    # Postcondition: $todo contains task text.
-
-    local item=$1
-    [ -z "$item" ] && die "$errmsg"
-    [ "${item//[0-9]/}" ] && die "$errmsg"
-
-    todo=$(sed "$item!d" "${2:-$TODO_FILE}")
-    [ -z "$todo" ] && die "$(getPrefix "$2"): No task $item."
-}
-getNewtodo()
-{
-    # Parameters:    $1: task number
-    #                $2: Optional todo file
-    # Precondition:  None.
-    # Postcondition: $newtodo contains task text.
-
-    local item=$1
-    [ -z "$item" ] && die 'Programming error: $item should exist.'
-    [ "${item//[0-9]/}" ] && die 'Programming error: $item should be numeric.'
-
-    newtodo=$(sed "$item!d" "${2:-$TODO_FILE}")
-    [ -z "$newtodo" ] && die "$(getPrefix "$2"): No updated task $item."
-}
-
 archive()
 {
     #defragment blank lines
@@ -384,7 +308,12 @@ replaceOrPrepend()
       ;;
   esac
   shift; item=$1; shift
-  getTodo "$item"
+
+  [ -z "$item" ] && die "$errmsg"
+  [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+  todo=$(sed "$item!d" "$TODO_FILE")
+  [ -z "$todo" ] && die "TODO: No task $item."
 
   if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
     echo -n "$querytext"
@@ -392,11 +321,11 @@ replaceOrPrepend()
   else
     input=$*
   fi
-  cleaninput "for sed"
+  cleaninput $input
 
   # Retrieve existing priority and prepended date
-  priority=$(sed -e "$item!d" -e $item's/^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\1/' "$TODO_FILE")
+  priority=$(sed -e "$item!d" -e $item's/^\(([A-Z]) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\1/' "$TODO_FILE")
-  prepdate=$(sed -e "$item!d" -e $item's/^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\2/' "$TODO_FILE")
+  prepdate=$(sed -e "$item!d" -e $item's/^\(([A-Z]) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\2/' "$TODO_FILE")
 
   if [ "$prepdate" -a "$action" = "replace" ] && [ "$(echo "$input"|sed -e 's/^\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\}\)\{0,1\}.*/\1/')" ]; then
     # If the replaced text starts with a date, it will replace the existing
@@ -409,7 +338,7 @@ replaceOrPrepend()
   # date again.
   sed -i.bak -e "$item s/^${priority}${prepdate}//" -e "$item s|^.*|${priority}${prepdate}${input}${backref}|" "$TODO_FILE"
   if [ $TODOTXT_VERBOSE -gt 0 ]; then
-    getNewtodo "$item"
+    newtodo=$(sed "$item!d" "$TODO_FILE")
     case "$action" in
       replace)
         echo "$item $todo"
@@ -487,10 +416,7 @@ do
         OVR_TODOTXT_FORCE=1
         ;;
     h )
-        # Short-circuit option parsing and forward to the action.
+        shorthelp
-        # Cannot just invoke shorthelp() because we need the configuration
-        # processed to locate the add-on actions directory.
-        set -- '-h' 'shorthelp'
         ;;
     n )
         OVR_TODOTXT_PRESERVE_LINE_NUMBERS=0
@@ -546,7 +472,6 @@ TODOTXT_AUTO_ARCHIVE=${TODOTXT_AUTO_ARCHIVE:-1}
 TODOTXT_DATE_ON_ADD=${TODOTXT_DATE_ON_ADD:-0}
 TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-}
 TODOTXT_SORT_COMMAND=${TODOTXT_SORT_COMMAND:-env LC_COLLATE=C sort -f -k2}
-TODOTXT_DISABLE_FILTER=${TODOTXT_DISABLE_FILTER:-}
 TODOTXT_FINAL_FILTER=${TODOTXT_FINAL_FILTER:-cat}
 
 # Export all TODOTXT_* variables
@@ -606,7 +531,7 @@ export SENTENCE_DELIMITERS=',.:;'
 }
 
 [ -e "$TODOTXT_CFG_FILE" ] || {
-    CFG_FILE_ALT=$(dirname "$0")"/todo.cfg"
+    CFG_FILE_ALT=`dirname "$0"`"/todo.cfg"
 
     if [ -e "$CFG_FILE_ALT" ]
     then
@@ -690,56 +615,22 @@ fi
 _addto() {
     file="$1"
     input="$2"
-    cleaninput
+    cleaninput $input
 
     if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
-        now=$(date '+%Y-%m-%d')
+        now=`date '+%Y-%m-%d'`
-        input=$(echo "$input" | sed -e 's/^\(([A-Z]) \)\{0,1\}/\1'"$now /")
+        input="$now $input"
     fi
     echo "$input" >> "$file"
     if [ $TODOTXT_VERBOSE -gt 0 ]; then
         TASKNUM=$(sed -n '$ =' "$file")
+        BASE=$(basename "$file")
+        PREFIX=$(echo ${BASE%%.[^.]*} | tr 'a-z' 'A-Z')
         echo "$TASKNUM $input"
-        echo "$(getPrefix "$file"): $TASKNUM added."
+        echo "${PREFIX}: $TASKNUM added."
     fi
 }
 
-shellquote()
-{
-    typeset -r qq=\'; printf %s\\n "'${1//\'/${qq}\\${qq}${qq}}'";
-}
-
-filtercommand()
-{
-    filter=${1:-}
-    shift
-    post_filter=${1:-}
-    shift
-
-    for search_term
-    do
-        ## See if the first character of $search_term is a dash
-        if [ "${search_term:0:1}" != '-' ]
-        then
-            ## First character isn't a dash: hide lines that don't match
-            ## this $search_term
-            filter="${filter:-}${filter:+ | }grep -i $(shellquote "$search_term")"
-        else
-            ## First character is a dash: hide lines that match this
-            ## $search_term
-            #
-            ## Remove the first character (-) before adding to our filter command
-            filter="${filter:-}${filter:+ | }grep -v -i $(shellquote "${search_term:1}")"
-        fi
-    done
-
-    [ -n "$post_filter" ] && {
-        filter="${filter:-}${filter:+ | }${post_filter:-}"
-    }
-
-    printf %s "$filter"
-}
-
 _list() {
     local FILE="$1"
     ## If the file starts with a "/" use absolute path. Otherwise,
@@ -763,8 +654,32 @@ _list() {
     ## Get our search arguments, if any
     shift ## was file name, new $1 is first search term
 
-    ## Build the filter.
+    ## Prefix the filter_command with the pre_filter_command
-    filter_command=$(filtercommand "${pre_filter_command:-}" "${post_filter_command:-}" "$@")
+    filter_command="${pre_filter_command:-}"
+
+    for search_term
+    do
+        ## See if the first character of $search_term is a dash
+        if [ "${search_term:0:1}" != '-' ]
+        then
+            ## First character isn't a dash: hide lines that don't match
+            ## this $search_term
+            filter_command="${filter_command:-} ${filter_command:+|} \
+                grep -i \"$search_term\" "
+        else
+            ## First character is a dash: hide lines that match this
+            ## $search_term
+            #
+            ## Remove the first character (-) before adding to our filter command
+            filter_command="${filter_command:-} ${filter_command:+|} \
+                grep -v -i \"${search_term:1}\" "
+        fi
+    done
+
+    ## If post_filter_command is set, append it to the filter_command
+    [ -n "$post_filter_command" ] && {
+        filter_command="${filter_command:-}${filter_command:+ | }${post_filter_command:-}"
+    }
 
     ## Figure out how much padding we need to use
     ## We need one level of padding for each power of 10 $LINES uses
@@ -782,7 +697,7 @@ _list() {
         | grep -v "^[ 0-9]\+ *$"
     )
     if [ "${filter_command}" ]; then
-        filtered_items=$(echo -n "$items" | eval "${filter_command}")
+        filtered_items=$(echo -n "$items" | eval ${filter_command})
     else
         filtered_items=$items
     fi
@@ -803,18 +718,17 @@ _list() {
                 return color
             }
             {
+                pos = match($0, /\([A-Z]\)/)
                 if (match($0, /^[0-9]+ x /)) {
                     print highlight("COLOR_DONE") $0 highlight("DEFAULT")
-                } else if (match($0, /^[0-9]+ \([A-Z]\)[[:space:]]/)) {
+                } else if (pos > 0) {
-                    clr = highlight("PRI_" substr($0, RSTART + RLENGTH - 3, 1))
+                    clr = highlight("PRI_" substr($0, pos+1, 1))
-                    print \
+                    print ( clr ? clr : highlight("PRI_X") ) $0 highlight("DEFAULT")
-                        (clr ? clr : highlight("PRI_X")) \
-                        (ENVIRON["HIDE_PRIORITY_SUBSTITUTION"] == "" ? $0 : substr($0, 1, RLENGTH - 4) substr($0, RSTART + RLENGTH)) \
-                        highlight("DEFAULT")
                 } else { print }
             }
           '''  \
         | sed '''
+            s/'${HIDE_PRIORITY_SUBSTITUTION:-^}'//g
             s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
             s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
           '''                                                   \
@@ -823,18 +737,20 @@ _list() {
     [ "$filtered_items" ] && echo "$filtered_items"
 
     if [ $TODOTXT_VERBOSE -gt 0 ]; then
+        BASE=$(basename "$FILE")
+        PREFIX=$(echo ${BASE%%.[^.]*} | tr 'a-z' 'A-Z')
         NUMTASKS=$( echo -n "$filtered_items" | sed -n '$ =' )
         TOTALTASKS=$( echo -n "$items" | sed -n '$ =' )
 
         echo "--"
-        echo "$(getPrefix "$FILE"): ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown"
+        echo "${PREFIX}: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown"
     fi
     if [ $TODOTXT_VERBOSE -gt 1 ]; then
         echo "TODO DEBUG: Filter Command was: ${filter_command:-cat}"
     fi
 }
 
-export -f cleaninput getPrefix getTodo getNewtodo shellquote filtercommand _list die
+export -f _list die
 
 # == HANDLE ACTION ==
 action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' )
@@ -911,8 +827,11 @@ case $action in
 "append" | "app" )
     errmsg="usage: $TODO_SH append ITEM# \"TEXT TO APPEND\""
     shift; item=$1; shift
-    getTodo "$item"
 
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+    todo=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$todo" ] && die "TODO: No task $item."
     if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
         echo -n "Append: "
         read input
@@ -923,11 +842,11 @@ case $action in
       [$SENTENCE_DELIMITERS]*)  appendspace=;;
       *)                        appendspace=" ";;
     esac
-    cleaninput "for sed"
+    cleaninput $input
 
     if sed -i.bak $item" s|^.*|&${appendspace}${input}|" "$TODO_FILE"; then
         if [ $TODOTXT_VERBOSE -gt 0 ]; then
-            getNewtodo "$item"
+            newtodo=$(sed "$item!d" "$TODO_FILE")
             echo "$item $newtodo"
 	fi
     else
@@ -942,11 +861,14 @@ case $action in
     # replace deleted line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
     errmsg="usage: $TODO_SH del ITEM# [TERM]"
     item=$2
-    getTodo "$item"
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+    DELETEME=$(sed "$item!d" "$TODO_FILE")
+    [ -z "$DELETEME" ] && die "TODO: No task $item."
 
     if [ -z "$3" ]; then
         if  [ $TODOTXT_FORCE = 0 ]; then
-            echo "Delete '$todo'?  (y/n)"
+            echo "Delete '$DELETEME'?  (y/n)"
             read ANSWER
         else
             ANSWER="y"
@@ -960,7 +882,7 @@ case $action in
                 sed -i.bak -e $item"s/^.*//" "$TODO_FILE"
             fi
             if [ $TODOTXT_VERBOSE -gt 0 ]; then
-                echo "$item $todo"
+                echo "$item $DELETEME"
                 echo "TODO: $item deleted."
             fi
         else
@@ -974,13 +896,13 @@ case $action in
             -e $item"s/ *$3  */ /g" \
             -e $item"s/$3//g" \
             "$TODO_FILE"
-        getNewtodo "$item"
+        newtodo=$(sed "$item!d" "$TODO_FILE")
-        if [ "$todo" = "$newtodo" ]; then
+        if [ "$DELETEME" = "$newtodo" ]; then
-            [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item $todo"
+            [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item $DELETEME"
             die "TODO: '$3' not found; no removal done."
         fi
         if [ $TODOTXT_VERBOSE -gt 0 ]; then
-            echo "$item $todo"
+            echo "$item $DELETEME"
             echo "TODO: Removed '$3' from task."
             echo "$item $newtodo"
         fi
@@ -994,18 +916,23 @@ case $action in
 
     # Split multiple depri's, if comma separated change to whitespace separated
     # Loop the 'depri' function for each item
-    for item in $(echo $* | tr ',' ' '); do
+    for item in `echo $* | tr ',' ' '`; do
-        getTodo "$item"
+	[[ "$item" = +([0-9]) ]] || die "$errmsg"
+	todo=$(sed "$item!d" "$TODO_FILE")
+	[ -z "$todo" ] && die "TODO: No task $item."
 
-	if [[ "$todo" = \(?\)\ * ]]; then
+	sed -e $item"s/^(.) //" "$TODO_FILE" > /dev/null 2>&1
+
+	if [ "$?" -eq 0 ]; then
+	    #it's all good, continue
 	    sed -i.bak -e $item"s/^(.) //" "$TODO_FILE"
 	    if [ $TODOTXT_VERBOSE -gt 0 ]; then
-		getNewtodo "$item"
+		NEWTODO=$(sed "$item!d" "$TODO_FILE")
-		echo "$item $newtodo"
+		echo "$item $NEWTODO"
 		echo "TODO: $item deprioritized."
 	    fi
 	else
-	    echo "TODO: $item is not prioritized."
+	    die "$errmsg"
 	fi
     done
     ;;
@@ -1018,22 +945,26 @@ case $action in
 
     # Split multiple do's, if comma separated change to whitespace separated
     # Loop the 'do' function for each item
-    for item in $(echo $* | tr ',' ' '); do
+    for item in `echo $* | tr ',' ' '`; do 
-        getTodo "$item"
+        [ -z "$item" ] && die "$errmsg"
+        [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
+        todo=$(sed "$item!d" "$TODO_FILE")
+        [ -z "$todo" ] && die "TODO: No task $item."
 
         # Check if this item has already been done
         if [ "${todo:0:2}" != "x " ]; then
-            now=$(date '+%Y-%m-%d')
+            now=`date '+%Y-%m-%d'`
             # remove priority once item is done
             sed -i.bak $item"s/^(.) //" "$TODO_FILE"
             sed -i.bak $item"s|^|x $now |" "$TODO_FILE"
             if [ $TODOTXT_VERBOSE -gt 0 ]; then
-                getNewtodo "$item"
+                newtodo=$(sed "$item!d" "$TODO_FILE")
                 echo "$item $newtodo"
                 echo "TODO: $item marked as done."
 	    fi
         else
-            echo "TODO: $item is already marked done."
+            echo "$item is already marked done"
         fi
     done
 
@@ -1052,16 +983,6 @@ case $action in
     help # just in case something failed above, we go ahead and just spew to STDOUT
     ;;
 
-"shorthelp" )
-    if [ -t 1 ] ; then # STDOUT is a TTY
-        if which "${PAGER:-less}" >/dev/null 2>&1; then
-            # we have a working PAGER (or less as a default)
-            shorthelp | "${PAGER:-less}" && exit 0
-        fi
-    fi
-    shorthelp # just in case something failed above, we go ahead and just spew to STDOUT
-    ;;
-
 "list" | "ls" )
     shift  ## Was ls; new $1 is first search term
     _list "$TODO_FILE" "$@"
@@ -1076,15 +997,10 @@ case $action in
 
 "listfile" | "lf" )
     shift  ## Was listfile, next $1 is file name
-    if [ $# -eq 0 ]; then
+    FILE="$1"
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "Files in the todo.txt directory:"
+    shift  ## Was filename; next $1 is first search term
-        cd "$TODO_DIR" && ls -1 *.txt
-    else
-        FILE="$1"
-        shift  ## Was filename; next $1 is first search term
 
-        _list "$FILE" "$@"
+    _list "$FILE" "$@"
-    fi
     ;;
 
 "listcon" | "lsc" )
@@ -1092,16 +1008,26 @@ case $action in
     ;;
 
 "listproj" | "lsprj" )
-    shift
+    grep -o '[^ ]*+[^ ]\+' "$TODO_FILE" | grep '^+' | sort -u
-    eval "$(filtercommand 'cat "$TODO_FILE"' '' "$@")" | grep -o '[^ ]*+[^ ]\+' | grep '^+' | sort -u
     ;;
 
 "listpri" | "lsp" )
-    shift ## was "listpri", new $1 is priority to list or first TERM
+    shift ## was "listpri", new $1 is priority to list
 
-    pri=$(printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$') && shift || pri="[A-Z]"
+    if [ "${1:-}" ]
-    post_filter_command="grep '^ *[0-9]\+ (${pri}) '"
+    then
-    _list "$TODO_FILE" "$@"
+        ## A priority was specified
+        pri=$( printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$' ) || {
+            die "usage: $TODO_SH listpri PRIORITY
+            note: PRIORITY must a single letter from A to Z."
+        }
+    else
+        ## No priority specified; show all priority tasks
+        pri="[[:upper:]]"
+    fi
+    pri="($pri)"
+
+    _list "$TODO_FILE" "$pri"
     ;;
 
 "move" | "mv" )
@@ -1111,16 +1037,19 @@ case $action in
     dest="$TODO_DIR/$3"
     src="$TODO_DIR/$4"
 
+    [ -z "$item" ] && die "$errmsg"
     [ -z "$4" ] && src="$TODO_FILE"
     [ -z "$dest" ] && die "$errmsg"
 
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+
     [ -f "$src" ] || die "TODO: Source file $src does not exist."
     [ -f "$dest" ] || die "TODO: Destination file $dest does not exist."
 
-    getTodo "$item" "$src"
+    MOVEME=$(sed "$item!d" "$src")
-    [ -z "$todo" ] && die "$item: No such item in $src."
+    [ -z "$MOVEME" ] && die "$item: No such item in $src."
     if  [ $TODOTXT_FORCE = 0 ]; then
-        echo "Move '$todo' from $src to $dest? (y/n)"
+        echo "Move '$MOVEME' from $src to $dest? (y/n)"
         read ANSWER
     else
         ANSWER="y"
@@ -1133,10 +1062,10 @@ case $action in
             # leave blank line behind (preserves line numbers)
             sed -i.bak -e $item"s/^.*//" "$src"
         fi
-        echo "$todo" >> "$dest"
+        echo "$MOVEME" >> "$dest"
 
         if [ $TODOTXT_VERBOSE -gt 0 ]; then
-            echo "$item $todo"
+            echo "$item $MOVEME"
             echo "TODO: $item moved from '$src' to '$dest'."
         fi
     else
@@ -1157,30 +1086,21 @@ case $action in
 note: PRIORITY must be anywhere from A to Z."
 
     [ "$#" -ne 3 ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
     [[ "$newpri" = @([A-Z]) ]] || die "$errmsg"
-    getTodo "$item"
 
-    oldpri=
+    sed -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1
-    if [[ "$todo" = \(?\)\ * ]]; then
-        oldpri=${todo:1:1}
-    fi
 
-    if [ "$oldpri" != "$newpri" ]; then
+    if [ "$?" -eq 0 ]; then
+        #it's all good, continue
         sed -i.bak -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE"
-    fi
+        if [ $TODOTXT_VERBOSE -gt 0 ]; then
-    if [ $TODOTXT_VERBOSE -gt 0 ]; then
+            NEWTODO=$(sed "$item!d" "$TODO_FILE")
-        getNewtodo "$item"
+            echo "$item $NEWTODO"
-        echo "$item $newtodo"
+            echo "TODO: $item prioritized ($newpri)."
-        if [ "$oldpri" != "$newpri" ]; then
+	fi
-            if [ "$oldpri" ]; then
+    else
-                echo "TODO: $item re-prioritized from ($oldpri) to ($newpri)."
+        die "$errmsg"
-            else
-                echo "TODO: $item prioritized ($newpri)."
-            fi
-        fi
-    fi
-    if [ "$oldpri" = "$newpri" ]; then
-        echo "TODO: $item already prioritized ($newpri)."
     fi
     ;;
 

todo_completion

@@ -1,71 +0,0 @@
-#!/bin/bash source-this-script
-[ "$BASH_VERSION" ] || return
-
-_todo()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    local -r OPTS="-@ -@@ -+ -++ -d -f -h -p -P -PP -a -n -t -v -vv -V -x"
-    local -r COMMANDS="\
-        add a addto addm append app archive command del  \
-        rm depri dp do help list ls listall lsa listcon  \
-        lsc listfile lf listpri lsp listproj lsprj move \
-        mv prepend prep pri p replace report shorthelp"
-
-    # Add custom commands from add-ons, if installed.
-    # TODO: Filter for executable flag of files found in $TODO_ACTIONS_DIR.
-    local allCommands="$COMMANDS $('ls' "${TODO_ACTIONS_DIR:-$HOME/.todo.actions.d}/" 2>/dev/null)"
-
-    local completions
-    if [ $COMP_CWORD -eq 1 ]; then
-        completions="$allCommands $OPTS"
-    elif [[ $COMP_CWORD -gt 2 && ( \
-        "${COMP_WORDS[COMP_CWORD-2]}" =~ ^(move|mv)$ || \
-        "${COMP_WORDS[COMP_CWORD-3]}" =~ ^(move|mv)$ ) ]]; then
-        # "move ITEM# DEST [SRC]" has file arguments on positions 2 and 3.
-        completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile)
-    else
-        case "$prev" in
-            command)
-                completions=$COMMANDS;;
-            addto|listfile|lf)
-                completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile);;
-            -*) completions="$allCommands $OPTS";;
-            *)  case "$cur" in
-                    +*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj);;
-                    @*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon);;
-                    *)  if [[ "$cur" =~ ^[0-9]+$ ]]; then
-                            local item=$(TODOTXT_VERBOSE=0 todo.sh -@ -+ -p -x command ls "^ *${cur} " | head -n 1)
-
-                            # Remove the (padded) task number; we prepend the
-                            # user-provided $cur.
-                            item=${item#* }
-
-                            # Remove the timestamp prepended by the -t option;
-                            # there's no todo.txt option for that yet.
-                            item=${item#[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] }
-
-                            # Append task text as a shell comment. This
-                            # completion can be a safety check before a
-                            # destructive todo.txt operation.
-                            [ "$item" ] && COMPREPLY[0]="$cur # $item"
-                            return 0
-                        else
-                            return 0
-                        fi
-                        ;;
-                esac
-                ;;
-        esac
-    fi
-
-    COMPREPLY=( $( compgen -W "$completions" -- $cur ))
-    return 0
-}
-complete -F _todo todo.sh
-# If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
-# completion for it, too:
-#complete -F _todo t