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.

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/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/t1200-pri.sh

@@ -53,28 +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
-
-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
@@ -85,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/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/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

@@ -58,7 +58,7 @@ shorthelp()
 		    listall|lsa [TERM...]
 		    listcon|lsc
 		    listfile|lf SRC [TERM...]
-		    listpri|lsp [PRIORITY] [TERM...]
+		    listpri|lsp [PRIORITY]
 		    listproj|lsprj
 		    move|mv ITEM# DEST [SRC]
 		    prepend|prep ITEM# "TEXT TO PREPEND"
@@ -143,11 +143,10 @@ help()
 		      sorted by priority with line  numbers.  If TERM specified, lists
 		      all lines that contain TERM in SRC file.
 
-		    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
@@ -326,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
@@ -533,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
@@ -620,8 +619,8 @@ _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
@@ -918,12 +917,15 @@ 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
 	[[ "$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
 		NEWTODO=$(sed "$item!d" "$TODO_FILE")
@@ -931,7 +933,7 @@ case $action in
 		echo "TODO: $item deprioritized."
 	    fi
 	else
-	    echo "TODO: $item is not prioritized."
+	    die "$errmsg"
 	fi
     done
     ;;
@@ -944,7 +946,7 @@ 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 
         [ -z "$item" ] && die "$errmsg"
         [[ "$item" = +([0-9]) ]] || die "$errmsg"
 
@@ -952,8 +954,8 @@ case $action in
         [ -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"
@@ -963,7 +965,7 @@ case $action in
                 echo "TODO: $item marked as done."
 	    fi
         else
-            echo "TODO: $item is already marked done."
+            echo "$item is already marked done"
         fi
     done
 
@@ -1011,11 +1013,22 @@ case $action in
     ;;
 
 "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" )
@@ -1077,23 +1090,18 @@ note: PRIORITY must be anywhere from A to Z."
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
     [[ "$newpri" = @([A-Z]) ]] || die "$errmsg"
 
-    oldpri=$(sed -ne $item's/^(\(.\)) .*/\1/p' "$TODO_FILE")
-    if [ "$oldpri" != "$newpri" ]; then
+    sed -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1
+
+    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
-        NEWTODO=$(sed "$item!d" "$TODO_FILE")
-        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
     ;;