Perform cleaninput() filtering without tr.

Again, Bash's global pattern substitution can be used. This only depends on the "extquote" shell option, which is set by default, but we set this just to be sure.
BUG: Multiple whitespace was condensed, CR/LF not turned to space.
2011-05-31 17:03:30 +02:00 · 2011-05-31 16:41:21 +02:00 · 2011-05-31 15:46:14 +02:00 · 2011-05-31 15:28:46 +02:00 · 2011-05-31 15:10:55 +02:00 · 2011-05-11 16:12:03 +02:00
15 changed files with 233 additions and 844 deletions
--- a/2
+++ b/2
@@ -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
--- a/tests/t0001-null.sh
+++ b/tests/t0001-null.sh
@@ -45,8 +45,6 @@ test_expect_success 'null listpri a' '
 cat > expect <<EOF
 --
 TODO: 0 of 0 tasks shown
-DONE: 0 of 0 tasks shown
-total 0 of 0 tasks shown
 EOF

 test_expect_success 'null lsa' '
--- a/tests/t0100-code-nobacktick.sh
+++ b/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
--- a/tests/t1010-add-date.sh
+++ b/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
--- a/tests/t1020-addtolistfile.sh
+++ b/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
 #
--- a/tests/t1200-pri.sh
+++ b/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
--- a/tests/t1250-listpri.sh
+++ b/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
-[0;32m1 (B) smell the uppercase Roses +flowers @outside[0m
-[1;34m2 (C) notice the sunflowers[0m
--
-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
--- a/tests/t1260-listprj.sh
+++ b/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
--- a/tests/t1300-ls.sh
+++ b/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
 [1;37m15 (D) @con02 +prj03 -- Some project 03 task, pri D[0m
 [1;37m16 (D) @con02 +prj04 -- Some project 04 task, pri D[0m
 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
 [1;37m15 (D) @con02 +prj03 -- Some project 03 task, pri D[0m
 [1;37m16 (D) @con02 +prj04 -- Some project 04 task, pri D[0m
 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
 [1;37m13 (D) @con01 +prj01 -- Some project 01 task, pri D[0m
 [1;37m14 (D) @con01 +prj02 -- Some project 02 task, pri D[0m
 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
 [1;37m13 @con01 +prj01 -- Some project 01 task, pri D[0m
 [1;37m14 @con01 +prj02 -- Some project 02 task, pri D[0m
 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
 [1;37m13 (D) @con01 -- Some project 01 task, pri D[0m
 [1;37m14 (D) @con01 -- Some project 02 task, pri D[0m
 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
 [1;37m13 (D) +prj01 -- Some project 01 task, pri D[0m
 [1;37m14 (D) +prj02 -- Some project 02 task, pri D[0m
 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
 [1;37m13 +prj01 -- Some project 01 task, pri D[0m
 [1;37m14 +prj02 -- Some project 02 task, pri D[0m
 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
 [1;37m13 (D) @con01 +prj01 -- Some project 01 task, pri D[0m
 [1;37m14 (D) @con01 +prj02 -- Some project 02 task, pri D[0m
 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
 [1;37m13 -- Some project 01 task, pri D[0m
 [1;37m14 -- Some project 02 task, pri D[0m
 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
--- a/tests/t1330-ls-highlighting.sh
+++ b/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;37m1 (D) some prioritized task[0m
-2 not prioritized
-3 should not be seen as PRIORITIZE(D) task
--
-TODO: 3 of 3 tasks shown
-EOF
-
 test_done
--- a/tests/t1350-listall.sh
+++ b/tests/t1350-listall.sh
@@ -1,150 +0,0 @@
-#!/bin/sh
-
-test_description='listall functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-smell the uppercase Roses +flowers @outside
-x 2011-08-08 tend the garden @outside
-notice the sunflowers
-x 2011-12-26 go outside +wakeup
-(A) stop
-EOF
-cat > done.txt <<EOF
-x 2011-12-01 eat breakfast
-x 2011-12-05 smell the coffee +wakeup
-EOF
-
-test_todo_session 'basic listall' <<EOF
->>> todo.sh -p listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
--
-TODO: 5 of 5 tasks shown
-DONE: 2 of 2 tasks shown
-total 7 of 7 tasks shown
-EOF
-
-test_todo_session 'listall highlighting' <<EOF
->>> todo.sh listall
-[1;33m5 (A) stop[0m
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-[0;37m2 x 2011-08-08 tend the garden @outside[0m
-[0;37m0 x 2011-12-01 eat breakfast[0m
-[0;37m0 x 2011-12-05 smell the coffee +wakeup[0m
-[0;37m4 x 2011-12-26 go outside +wakeup[0m
--
-TODO: 5 of 5 tasks shown
-DONE: 2 of 2 tasks shown
-total 7 of 7 tasks shown
-EOF
-
-test_todo_session 'listall nonverbose' <<EOF
->>> TODOTXT_VERBOSE=0 todo.sh -p listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
-EOF
-
-test_todo_session 'listall filtering' <<EOF
->>> todo.sh -p listall @outside
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
--
-TODO: 2 of 5 tasks shown
-DONE: 0 of 2 tasks shown
-total 2 of 7 tasks shown
-
->>> todo.sh -p listall the
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-05 smell the coffee +wakeup
--
-TODO: 3 of 5 tasks shown
-DONE: 1 of 2 tasks shown
-total 4 of 7 tasks shown
-
->>> todo.sh -p listall breakfast
-0 x 2011-12-01 eat breakfast
--
-TODO: 0 of 5 tasks shown
-DONE: 1 of 2 tasks shown
-total 1 of 7 tasks shown
-
->>> todo.sh -p listall doesnotmatch
--
-TODO: 0 of 5 tasks shown
-DONE: 0 of 2 tasks shown
-total 0 of 7 tasks shown
-EOF
-
-cat >> done.txt <<EOF
-x 2010-01-01 old task 1
-x 2010-01-01 old task 2
-x 2010-01-01 old task 3
-x 2010-01-01 old task 4
-EOF
-test_todo_session 'listall number width' <<EOF
->>> todo.sh -p listall
-5 (A) stop
-3 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-0 x 2010-01-01 old task 1
-0 x 2010-01-01 old task 2
-0 x 2010-01-01 old task 3
-0 x 2010-01-01 old task 4
-2 x 2011-08-08 tend the garden @outside
-0 x 2011-12-01 eat breakfast
-0 x 2011-12-05 smell the coffee +wakeup
-4 x 2011-12-26 go outside +wakeup
--
-TODO: 5 of 5 tasks shown
-DONE: 6 of 6 tasks shown
-total 11 of 11 tasks shown
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 1
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 2
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 3
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 4
-
->>> TODOTXT_VERBOSE=0 todo.sh add new task 5
-
->>> todo.sh -p listall
-05 (A) stop
-06 new task 1
-07 new task 2
-08 new task 3
-09 new task 4
-10 new task 5
-03 notice the sunflowers
-01 smell the uppercase Roses +flowers @outside
-00 x 2010-01-01 old task 1
-00 x 2010-01-01 old task 2
-00 x 2010-01-01 old task 3
-00 x 2010-01-01 old task 4
-02 x 2011-08-08 tend the garden @outside
-00 x 2011-12-01 eat breakfast
-00 x 2011-12-05 smell the coffee +wakeup
-04 x 2011-12-26 go outside +wakeup
--
-TODO: 10 of 10 tasks shown
-DONE: 6 of 6 tasks shown
-total 16 of 16 tasks shown
-EOF
-
-test_done
--- a/tests/t1500-do.sh
+++ b/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
--- a/tests/t1700-depri.sh
+++ b/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
--- a/todo.sh
+++ b/todo.sh
@@ -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...]]
-		    listpri|lsp [PRIORITY] [TERM...]
-		    listproj|lsprj [TERM...]
+		    listfile|lf SRC [TERM...]
+		    listpri|lsp [PRIORITY]
+		    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:
-		    -@
-		        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:
+		  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.
@@ -211,19 +137,16 @@ help()
 		    lsc
 		      Lists all the task contexts that start with the @ sign in todo.txt.

-		    listfile [SRC [TERM...]]
-		    lf [SRC [TERM...]]
+		    listfile 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
 		      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...]
-		    lsp [PRIORITY] [TERM...]
+		    listpri [PRIORITY]
+		    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.

 		    listproj
 		    lsprj
@@ -253,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()
-{
-    if [ -d "$TODO_ACTIONS_DIR" ]; then
-        didPrintAddonActionsHeader=
+		  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_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 [ ! "$didPrintAddonActionsHeader" ]; then
-                    cat <<-EndAddonActionsHeader
-		  Add-on Actions:
-	EndAddonActionsHeader
-                    didPrintAddonActionsHeader=1
-                fi
+            if [ -f "$action" -a -x "$action" ]
+            then
                "$action" usage
            fi
        done
+        echo ""
    fi
+
+
+    exit 1
 }

 die()
@@ -296,11 +267,6 @@ cleanup()

 cleaninput()
 {
-    # Parameters:    When $1 = "for sed", performs additional escaping for use
-    #                in sed substitution with "|" separators.
-    # Precondition:  $input contains text to be cleaned.
-    # Postcondition: Modifies $input.
-
    # Replace CR and LF with space; tasks always comprise a single line.
    input=${input//$'\r'/ }
    input=${input//$'\n'/ }
@@ -315,44 +281,6 @@ cleaninput()
    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
@@ -381,7 +309,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,8 +325,8 @@ replaceOrPrepend()
  cleaninput "for sed"

  # 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")
-  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")
+  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/^\(([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
@@ -406,7 +339,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"
@@ -484,10 +417,7 @@ do
        OVR_TODOTXT_FORCE=1
        ;;
    h )
-        # Short-circuit option parsing and forward to the action.
-        # Cannot just invoke shorthelp() because we need the configuration
-        # processed to locate the add-on actions directory.
-        set -- '-h' 'shorthelp'
+        shorthelp
        ;;
    n )
        OVR_TODOTXT_PRESERVE_LINE_NUMBERS=0
@@ -543,7 +473,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
@@ -603,7 +532,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,53 +619,19 @@ _addto() {
    cleaninput

    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
-        now=$(date '+%Y-%m-%d')
-        input=$(echo "$input" | sed -e 's/^\(([A-Z]) \)\{0,1\}/\1'"$now /")
+        now=`date '+%Y-%m-%d'`
+        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,
@@ -760,8 +655,32 @@ _list() {
    ## Get our search arguments, if any
    shift ## was file name, new $1 is first search term

-    ## Build the filter.
-    filter_command=$(filtercommand "${pre_filter_command:-}" "${post_filter_command:-}" "$@")
+    ## Prefix the filter_command with the pre_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
@@ -779,7 +698,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
@@ -800,18 +719,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:]]/)) {
-                    clr = highlight("PRI_" substr($0, RSTART + RLENGTH - 3, 1))
-                    print \
-                        (clr ? clr : highlight("PRI_X")) \
-                        (ENVIRON["HIDE_PRIORITY_SUBSTITUTION"] == "" ? $0 : substr($0, 1, RLENGTH - 4) substr($0, RSTART + RLENGTH)) \
-                        highlight("DEFAULT")
+                } else if (pos > 0) {
+                    clr = highlight("PRI_" substr($0, pos+1, 1))
+                    print ( clr ? clr : highlight("PRI_X") ) $0 highlight("DEFAULT")
                } else { print }
            }
          '''  \
        | sed '''
+            s/'${HIDE_PRIORITY_SUBSTITUTION:-^}'//g
            s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
            s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
          '''                                                   \
@@ -820,18 +738,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 cleaninput _list die

 # == HANDLE ACTION ==
 action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' )
@@ -908,8 +828,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
@@ -924,7 +847,7 @@ case $action in

    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
@@ -939,11 +862,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"
@@ -957,7 +883,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
@@ -971,13 +897,13 @@ case $action in
            -e $item"s/ *$3  */ /g" \
            -e $item"s/$3//g" \
            "$TODO_FILE"
-        getNewtodo "$item"
-        if [ "$todo" = "$newtodo" ]; then
-            [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item $todo"
+        newtodo=$(sed "$item!d" "$TODO_FILE")
+        if [ "$DELETEME" = "$newtodo" ]; then
+            [ $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
@@ -991,18 +917,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
-        getTodo "$item"
+    for item in `echo $* | tr ',' ' '`; do
+	[[ "$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"
-		echo "$item $newtodo"
+		NEWTODO=$(sed "$item!d" "$TODO_FILE")
+		echo "$item $NEWTODO"
 		echo "TODO: $item deprioritized."
 	    fi
 	else
-	    echo "TODO: $item is not prioritized."
+	    die "$errmsg"
 	fi
    done
    ;;
@@ -1015,22 +946,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
-        getTodo "$item"
+    for item in `echo $* | tr ',' ' '`; do 
+        [ -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')
+        if [ `echo $todo | grep -c "^x "` -eq 0 ] ; then
+            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

@@ -1049,16 +984,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" "$@"
@@ -1068,33 +993,15 @@ case $action in
    shift  ## Was lsa; new $1 is first search term

    cat "$TODO_FILE" "$DONE_FILE" > "$TMP_FILE"
-    TOTAL=$( sed -n '$ =' "$TODO_FILE" )
-
-    post_filter_command="awk -v TOTAL=$TOTAL -v PADDING=${#TOTAL} '{ \$1 = sprintf(\"%\" PADDING \"d\", (\$1 > TOTAL ? 0 : \$1)); print }' "
-    TODOTXT_VERBOSE=0 _list "$TMP_FILE" "$@"
-
-    if [ $TODOTXT_VERBOSE -gt 0 ]; then
-        TDONE=$( sed -n '$ =' "$DONE_FILE" )
-        TASKNUM=$(TODOTXT_PLAIN=1 TODOTXT_VERBOSE=0 _list "$TODO_FILE" "$@" | sed -n '$ =')
-        DONENUM=$(TODOTXT_PLAIN=1 TODOTXT_VERBOSE=0 _list "$DONE_FILE" "$@" | sed -n '$ =')
-        echo "--"
-        echo "$(getPrefix "$TODO_FILE"): ${TASKNUM:-0} of ${TOTAL:-0} tasks shown"
-        echo "$(getPrefix "$DONE_FILE"): ${DONENUM:-0} of ${TDONE:-0} tasks shown"
-        echo "total $((TASKNUM + DONENUM)) of $((TOTAL + TDONE)) tasks shown"
-    fi
+    _list "$TMP_FILE" "$@"
    ;;

 "listfile" | "lf" )
    shift  ## Was listfile, next $1 is file name
-    if [ $# -eq 0 ]; then
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "Files in the todo.txt directory:"
-        cd "$TODO_DIR" && ls -1 *.txt
-    else
-        FILE="$1"
-        shift  ## Was filename; next $1 is first search term
+    FILE="$1"
+    shift  ## Was filename; next $1 is first search term

-        _list "$FILE" "$@"
-    fi
+    _list "$FILE" "$@"
    ;;

 "listcon" | "lsc" )
@@ -1102,16 +1009,26 @@ case $action in
    ;;

 "listproj" | "lsprj" )
-    shift
-    eval "$(filtercommand 'cat "$TODO_FILE"' '' "$@")" | grep -o '[^ ]*+[^ ]\+' | grep '^+' | sort -u
+    grep -o '[^ ]*+[^ ]\+' "$TODO_FILE" | 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]"
-    post_filter_command="grep '^ *[0-9]\+ (${pri}) '"
-    _list "$TODO_FILE" "$@"
+    if [ "${1:-}" ]
+    then
+        ## 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" )
@@ -1121,16 +1038,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"
-    [ -z "$todo" ] && die "$item: No such item in $src."
+    MOVEME=$(sed "$item!d" "$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"
@@ -1143,10 +1063,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
@@ -1167,30 +1087,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=
-    if [[ "$todo" = \(?\)\ * ]]; then
-        oldpri=${todo:1:1}
-    fi
+    sed -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1

-    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
-        getNewtodo "$item"
-        echo "$item $newtodo"
-        if [ "$oldpri" != "$newpri" ]; then
-            if [ "$oldpri" ]; then
-                echo "TODO: $item re-prioritized from ($oldpri) to ($newpri)."
-            else
-                echo "TODO: $item prioritized ($newpri)."
-            fi
-        fi
-    fi
-    if [ "$oldpri" = "$newpri" ]; then
-        echo "TODO: $item already prioritized ($newpri)."
+        if [ $TODOTXT_VERBOSE -gt 0 ]; then
+            NEWTODO=$(sed "$item!d" "$TODO_FILE")
+            echo "$item $NEWTODO"
+            echo "TODO: $item prioritized ($newpri)."
+	fi
+    else
+        die "$errmsg"
    fi
    ;;

--- a/71
+++ b/71
@@ -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
Author	SHA1	Message	Date
Ingo Karkat	ef9c48d7ef	Perform cleaninput() filtering without tr. Again, Bash's global pattern substitution can be used. This only depends on the "extquote" shell option, which is set by default, but we set this just to be sure.	2011-05-31 17:03:30 +02:00
Ingo Karkat	3134e8f51a	BUG: Multiple whitespace was condensed, CR/LF not turned to space. Missing quoting inside cleaninput() condensed multiple subsequent spaces into a single space, even when the user took pains to preserve whitespace by properly quoting the task in the shell. The 'tr' command completely removed CR and LF characters instead of replacing them with a single space. Add test cases for the whitespace handling to the add, append, prepend and replace actions.	2011-05-31 16:41:21 +02:00
Ingo Karkat	0e3c8eb29b	Expose cleaninput() for use in addons. Despite its hard-coded use of $input, this can be useful in addons, too. (I, for example, use this in a "todo.sh subst" addon that delegates to the "todo.sh replace" action after performing a sed-style replacement on the passed pattern and replacement.)	2011-05-31 15:46:14 +02:00
Ingo Karkat	e5d13150a9	Perform cleaninput() escaping without sed. No need for invoking sed; Bash's global pattern substitution can be used.	2011-05-31 15:28:46 +02:00
Ingo Karkat	267e771ba8	Escape the substitution separator in cleaninput(). Improving on the previous fix and commit, no search for an unused substitution separator is actually needed; sed supports escaping of the substitution separator. Revert the $inputSep abstraction in favor of the former, hard-coded "\|" character.	2011-05-31 15:10:55 +02:00
Ingo Karkat	a97144d0e8	FIX: cleaninput() for sed-replacement needs more escaping and unique separator. Commit `8e4364f5e1` removed the deletion of the "\|" character from cleaninput. That was okay for the cleaninput() use in _addto(), but not in those cases that used $input for replacement via sed. Added corresponding tests for replace, append and prepend actions similar to what was added for the add action in the above commit. To really fix the problem (and not just remove all "\|" characters from the text), a separator character must be found that is not part of $input, and this must be used in the sed expression. As cleaninput() already modifies the global $input variable, another $inputSep global variable is used to pass back this information. In addition, backslashes must be escaped in $input, or replacements like \1 wreak havoc.	2011-05-11 16:12:03 +02:00
Ingo Karkat	41dba2d636	Configure cleaninput() sed-escaping via argument instead of magic words. Encoding the actions that require the additional sed-escaping inside cleaninput() is cumbersome and error-prone. Instead, let the calling action tell cleaninput() that it wants this.	2011-05-11 15:48:22 +02:00
Ingo Karkat	4643dce698	Remove no-op passing of $input to cleaninput(). The function actually uses and modifies the global variable directly.	2011-05-11 15:32:31 +02:00
Ingo Karkat	631b2fbcc3	Made replace test sessions independent from each other. When the tests depend on the todo.txt contents from the previous sessions, errors will cascade and make it more difficult to pinpoint the problem.	2011-05-11 15:07:33 +02:00