diff --git a/todo.sh b/todo.sh index 1357c20..0157883 100755 --- a/todo.sh +++ b/todo.sh @@ -296,6 +296,11 @@ 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'/ } @@ -310,6 +315,35 @@ cleaninput() fi } +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 "TODO: No task $item${2:+ in $2}." +} +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 "TODO: No updated task $item${2:+ in $2}." +} + archive() { #defragment blank lines @@ -338,12 +372,7 @@ replaceOrPrepend() ;; esac shift; item=$1; shift - - [ -z "$item" ] && die "$errmsg" - [[ "$item" = +([0-9]) ]] || die "$errmsg" - - todo=$(sed "$item!d" "$TODO_FILE") - [ -z "$todo" ] && die "TODO: No task $item." + getTodo "$item" if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then echo -n "$querytext" @@ -368,7 +397,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 - newtodo=$(sed "$item!d" "$TODO_FILE") + getNewtodo "$item" case "$action" in replace) echo "$item $todo" @@ -797,7 +826,7 @@ _list() { fi } -export -f cleaninput shellquote filtercommand _list die +export -f cleaninput getTodo getNewtodo shellquote filtercommand _list die # == HANDLE ACTION == action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' ) @@ -874,11 +903,8 @@ 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 @@ -893,7 +919,7 @@ case $action in if sed -i.bak $item" s|^.*|&${appendspace}${input}|" "$TODO_FILE"; then if [ $TODOTXT_VERBOSE -gt 0 ]; then - newtodo=$(sed "$item!d" "$TODO_FILE") + getNewtodo "$item" echo "$item $newtodo" fi else @@ -908,14 +934,11 @@ 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 - [ -z "$item" ] && die "$errmsg" - [[ "$item" = +([0-9]) ]] || die "$errmsg" - DELETEME=$(sed "$item!d" "$TODO_FILE") - [ -z "$DELETEME" ] && die "TODO: No task $item." + getTodo "$item" if [ -z "$3" ]; then if [ $TODOTXT_FORCE = 0 ]; then - echo "Delete '$DELETEME'? (y/n)" + echo "Delete '$todo'? (y/n)" read ANSWER else ANSWER="y" @@ -929,7 +952,7 @@ case $action in sed -i.bak -e $item"s/^.*//" "$TODO_FILE" fi if [ $TODOTXT_VERBOSE -gt 0 ]; then - echo "$item $DELETEME" + echo "$item $todo" echo "TODO: $item deleted." fi else @@ -943,13 +966,13 @@ case $action in -e $item"s/ *$3 */ /g" \ -e $item"s/$3//g" \ "$TODO_FILE" - newtodo=$(sed "$item!d" "$TODO_FILE") - if [ "$DELETEME" = "$newtodo" ]; then - [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item $DELETEME" + getNewtodo "$item" + if [ "$todo" = "$newtodo" ]; then + [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item $todo" die "TODO: '$3' not found; no removal done." fi if [ $TODOTXT_VERBOSE -gt 0 ]; then - echo "$item $DELETEME" + echo "$item $todo" echo "TODO: Removed '$3' from task." echo "$item $newtodo" fi @@ -964,15 +987,13 @@ 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 - [[ "$item" = +([0-9]) ]] || die "$errmsg" - todo=$(sed "$item!d" "$TODO_FILE") - [ -z "$todo" ] && die "TODO: No task $item." + getTodo "$item" if [[ "$todo" = \(?\)\ * ]]; then sed -i.bak -e $item"s/^(.) //" "$TODO_FILE" if [ $TODOTXT_VERBOSE -gt 0 ]; then - NEWTODO=$(sed "$item!d" "$TODO_FILE") - echo "$item $NEWTODO" + getNewtodo "$item" + echo "$item $newtodo" echo "TODO: $item deprioritized." fi else @@ -990,11 +1011,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 - [ -z "$item" ] && die "$errmsg" - [[ "$item" = +([0-9]) ]] || die "$errmsg" - - todo=$(sed "$item!d" "$TODO_FILE") - [ -z "$todo" ] && die "TODO: No task $item." + getTodo "$item" # Check if this item has already been done if [ "${todo:0:2}" != "x " ]; then @@ -1003,7 +1020,7 @@ case $action in sed -i.bak $item"s/^(.) //" "$TODO_FILE" sed -i.bak $item"s|^|x $now |" "$TODO_FILE" if [ $TODOTXT_VERBOSE -gt 0 ]; then - newtodo=$(sed "$item!d" "$TODO_FILE") + getNewtodo "$item" echo "$item $newtodo" echo "TODO: $item marked as done." fi @@ -1086,19 +1103,16 @@ 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." - MOVEME=$(sed "$item!d" "$src") - [ -z "$MOVEME" ] && die "$item: No such item in $src." + getTodo "$item" "$src" + [ -z "$todo" ] && die "$item: No such item in $src." if [ $TODOTXT_FORCE = 0 ]; then - echo "Move '$MOVEME' from $src to $dest? (y/n)" + echo "Move '$todo' from $src to $dest? (y/n)" read ANSWER else ANSWER="y" @@ -1111,10 +1125,10 @@ case $action in # leave blank line behind (preserves line numbers) sed -i.bak -e $item"s/^.*//" "$src" fi - echo "$MOVEME" >> "$dest" + echo "$todo" >> "$dest" if [ $TODOTXT_VERBOSE -gt 0 ]; then - echo "$item $MOVEME" + echo "$item $todo" echo "TODO: $item moved from '$src' to '$dest'." fi else @@ -1135,11 +1149,8 @@ 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" - - todo=$(sed "$item!d" "$TODO_FILE") - [ -z "$todo" ] && die "TODO: No task $item." + getTodo "$item" oldpri= if [[ "$todo" = \(?\)\ * ]]; then @@ -1150,8 +1161,8 @@ note: PRIORITY must be anywhere from A to Z." 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" + getNewtodo "$item" + echo "$item $newtodo" if [ "$oldpri" != "$newpri" ]; then if [ "$oldpri" ]; then echo "TODO: $item re-prioritized from ($oldpri) to ($newpri)."