Birdseye: Update version and changelog

Update birdseye script for compatibility with Python 3

.todo.actions.d/README

@@ -0,0 +1,10 @@
+TODO.TXT CLI Add-ons
+
+adda (symlink to aa for fewer keystrokes)
+* Adds a task and prioritizes it A in one shot
+
+addx (symlink ax for fewer keystrokes)
+* Adds a task and marks it as complete in one shot
+
+birdseye (requires Python in path and birdseye.py file)
+* Generates a textual report of open and complete tasks in all contexts and projects

.todo.actions.d/adda

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+action=$1
+shift
+
+[ "$action" = "usage" ] && {
+  echo "  Add and prioritize A:"
+  curcmd=`basename $0`
+  echo "    $curcmd \"THING I NEED TO DO +project @context\""
+  echo "      Add an item and prioritize it A in one step"
+  echo ""
+  exit
+}
+
+if "$TODO_SH" command add "$@"; then
+    # figure out the line of what we just added, and prioritize it A
+    line=`sed -n '$ =' "$TODO_FILE"`
+    echo "$line"
+    "$TODO_SH" command pri "$line" A 
+fi

.todo.actions.d/addx

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+action=$1
+shift
+
+[ "$action" = "usage" ] && {
+  echo "  Add and do:"
+  curcmd=`basename $0`
+  echo "    $curcmd \"THING I DID +project @context\""
+  echo "      Add an item and mark it as done in one step"
+  echo ""
+  exit
+}
+
+if "$TODO_SH" command add "$@"; then
+    # figure out the line of what we just added, and prioritize it A
+    line=`sed -n '$ =' "$TODO_FILE"`
+    echo "$line"
+    "$TODO_SH" command do "$line"  
+fi

.todo.actions.d/birdseye

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+action=$1
+shift
+
+[ "$action" = "usage" ] && {
+  echo "  Bird's eye report:"
+  echo "    birdseye"
+  echo "      generates a textual report of pending and completed tasks in all projects and contexts"
+  echo ""
+  exit
+}
+
+[ "$action" = "birdseye" ] && {
+     python ${TODO_ACTIONS_DIR}/birdseye.py "$TODO_FILE" "$DONE_FILE"
+}

.todo.actions.d/birdseye.py

@@ -0,0 +1,202 @@
+#!/usr/bin/python
+
+""" TODO.TXT Bird's Eye View Reporter
+USAGE:
+    birdseye.py [todo.txt] [done.txt]
+
+USAGE NOTES:
+    Expects two text files as parameters, each of which formatted as follows:
+    - One todo per line, ie, "call Mom"
+    - with an optional project association indicated as such: "+projectname"
+    - with the context in which the tasks should be completed, indicated as such: "@context"
+    - with the task priority optionally listed at the front of the line, in parens, ie, "(A)"
+
+    For example, 4 lines of todo.txt might look like this:
+
+    +garagesale @phone schedule Goodwill pickup
+    (A) @phone Tell Mom I love her
+    +writing draft Great American Novel
+    (B) smell the roses
+
+    The done.txt file is a list of completed todos from todo.txt.
+
+    See more on todo.txt here:
+    http://todotxt.com
+
+
+OUTPUT:
+    Displays a list of:
+    - working projects and their percentage complete
+    - contexts in which open todos exist
+    - contexts and projects with tasks that have been prioritized
+    - projects which are completely done (don't have any open todos)
+
+CHANGELOG:
+    2016.03.17 - Update for Python 3. Tx, JonathanReeve!
+    2006.07.29 - Now supports p:, p- and + project notation.  Tx, Pedro!
+    2006.05.02 - Released
+"""
+
+
+import sys
+
+__version__ = "1.2"
+__date__ = "2006/05/02"
+__updated__ = "2016/03/17"
+__author__ = "Gina Trapani (ginatrapani@gmail.com)"
+__copyright__ = "Copyright 2006 - 2016, Gina Trapani"
+__license__ = "GPL"
+__history__ = """
+1.2 - Update for Python 3. Tx, JonathanReeve!
+1.1 - Now supports p:, p- and + project notation.  Tx, Pedro!
+1.0 - Released.
+"""
+
+def usage():
+    print("USAGE:  %s [todo.txt] [done.txt]" % (sys.argv[0], ))
+
+def printTaskGroups(title, taskDict, priorityList, percentages):
+    print("")
+    print("%s"% (title,))
+    separator("-")
+    if not taskDict:
+        print("No items to list.")
+    else:
+        # sort the dictionary by value
+        # http://python.fyxm.net/peps/pep-0265.html
+        items = [(v, k) for k, v in list(taskDict.items())]
+        items.sort()
+        items.reverse()             # so largest is first
+        items = [(k, v) for v, k in items]
+
+        for item in items:
+            if item[0] in priorityList:
+                if item[0] not in percentages:
+                    printTaskGroup(item, -1, "*")
+                else:
+                    printTaskGroup(item, percentages[item[0]], "*")
+
+        for item in items:
+            if item[0] not in priorityList:
+                if item[0] not in percentages:
+                    printTaskGroup(item, -1, " ")
+                else:
+                    printTaskGroup(item, percentages[item[0]], " ")
+
+def printTaskGroup(p, pctage, star):
+    if pctage > -1:
+        progressBar = ""
+        numStars = int(pctage//10)
+        progressBar = "=" * numStars
+        numSpaces = 10 - numStars
+        for n in range(numSpaces):
+            progressBar += " "
+
+        if pctage > 9:
+            displayTotal = " %d%%"% (pctage, );
+        else:
+            displayTotal = "  %d%%"% (pctage, );
+        print("%s %s [%s] %s (%d todos)"% (star, displayTotal, progressBar,  p[0], p[1],))
+    else:
+        print("%s %s (%d todos)"% (star, p[0], p[1], ))
+
+def separator(c):
+    sep = ""
+    sep = c * 42
+    print(sep)
+
+
+def main(argv):
+    # make sure you have all your args
+    if len(argv) < 2:
+        usage()
+        sys.exit(2)
+
+    # process todo.txt
+    try:
+        f = open (argv[0], "r")
+        projects = {}
+        contexts = {}
+        projectPriority = []
+        contextPriority = []
+        for line in f:
+            prioritized = False
+            words = line.split()
+            if words and words[0].startswith("("):
+                prioritized = True
+            for word in words:
+                if word[0:2] == "p:" or word[0:2] == "p-" or word[0:1] == "+":
+                    if word not in projects:
+                        projects[word] = 1
+                    else:
+                        projects[word] = projects.setdefault(word,0)  + 1
+                    if prioritized:
+                        projectPriority.append(word)
+                if word[0:1] == "@":
+                    if word not in contexts:
+                        contexts[word] = 1
+                    else:
+                        contexts[word] = contexts.setdefault(word, 0)  + 1
+                    if prioritized:
+                        contextPriority.append(word)
+        f.close()
+    except IOError:
+        print("ERROR:  The file named %s could not be read."% (argv[0], ))
+        usage()
+        sys.exit(2)
+
+    # process done.txt
+    try:
+        completedTasks = {}
+        f = open (argv[1], "r")
+        for line in f:
+            words = line.split()
+            for word in words:
+                if word[0:2] == "p:" or word[0:2] == "p-" or word[0:1] == "+":
+                    if word not in completedTasks:
+                        completedTasks[word] = 1
+                    else:
+                        completedTasks[word] = completedTasks.setdefault(word, 0) + 1
+        f.close()
+    except IOError:
+        print("ERROR:  The file named %s could not be read."% (argv[1], ))
+        usage()
+        sys.exit(2)
+
+    # calculate percentages
+    projectPercentages = {}
+    for project in projects:
+        openTasks = projects[project]
+        if project in completedTasks:
+            closedTasks = completedTasks[project]
+        else:
+            closedTasks = 0
+        totalTasks = openTasks + closedTasks
+        projectPercentages[project] = (closedTasks*100) / totalTasks
+
+    # get projects all done
+    projectsWithNoIncompletes = {}
+    for task in completedTasks:
+        if task not in projects:
+            projectsWithNoIncompletes[task] = 0
+
+    # print out useful info
+    #print "TODO.TXT Bird's Eye View Report %s"% ( datetime.date.today().isoformat(), )
+    print("")
+    print("TODO.TXT Bird's Eye View Report")
+
+    separator("=")
+
+    printTaskGroups("Projects with Open TODOs", projects, projectPriority, projectPercentages)
+    printTaskGroups("Contexts with Open TODOs", contexts, contextPriority, projectPercentages)
+    printTaskGroups("Completed Projects (No open TODOs)", projectsWithNoIncompletes, projectPriority, projectPercentages)
+    print("")
+    print("* Projects and contexts with an asterisk next to them denote prioritized tasks.")
+    print("Project with prioritized tasks are listed first, then sorted by number of open todos.")
+    print("")
+
+
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])

README.textile

@@ -23,4 +23,4 @@ h2. Quick Links
 * Licensed under the "GPL":http://www.gnu.org/copyleft/gpl.html
 * "Add-on Directory":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-add-on-directory
 * "Changelog":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-changelog
-* "Known Bugs":http://github.com/ginatrapani/todo.txt-cli/issues
+* "Known Bugs":http://wiki.github.com/ginatrapani/todo.txt-cli/known-bugs

tests/README

@@ -105,7 +105,7 @@ First digit tells the family:
 
 	0 - the absolute basics and global stuff
 	1 - basic every-day usage
-	2 - add ins
+        2 - add ins
 
 Second digit tells the particular command we are testing.
 
@@ -176,23 +176,6 @@ Test harness library
 There are a handful helper functions defined in the test harness
 library for your script to use.
 
- - test_todo_session <message> < transcript
-
-   This takes a single string as a parameter, which is treated
-   as a base description of what is being tested, and then
-   reads from standard input a transcript of todo.sh commands
-   and expected output.  Each command is run in the current
-   test environment and the output is compared with the
-   expected output.  (See below for how to generate transcripts
-   easily.)
-
- - test_tick [interval]
-
-   The test harness has an internal view of time which is
-   implemented by wrapping the date command.  This takes a single
-   optional positive integer parameter which indicates how much
-   to advance the internal time.  The default value is one day.
-
  - test_expect_success <message> <script>
 
    This takes two strings as parameter, and evaluates the
@@ -228,31 +211,9 @@ library for your script to use.
    exit with an appropriate error code.
 
 
-Generating test transcripts
----------------------------
-
-You can generate test scripts from screenshots as following:
-
-    $ ./testshell.sh
-
-You'll be in a special test environment with an empty todo.txt
-and the dates and timestamps will be artificially fixed.
-
-Then the session can be used to make a unit test thanks to
-test_todo_session, see the existing tests as examples.
-
-Be careful to replace all occurences of the full path to the test
-directory by $HOME as testshell.sh will explain you when you execute it
-otherwise the tests will work properly only on your own computer.
-
-Don't use "script" as this would log every keystroke, not only what's
-visible!!
-
-
 Credits
 -------
 
 This test framework was derived from the framework used by
 git itself, written originally by Junio Hamano and licensed
-for use under the GPL.  It was specialized for todo.txt-cli
+for use under the GPL.
-by Emil Sit and Philippe Teuwen.

tests/t0000-config.sh

@@ -10,7 +10,7 @@ to find it somewhere else.
 
 # Remove the pre-created todo.cfg to test behavior in its absence
 rm -f todo.cfg
-echo "Fatal error: Cannot read configuration file $HOME/.todo/config" > expect
+echo "Fatal error: Cannot read configuration file $HOME/todo.cfg" > expect
 test_expect_success 'no config file' '
     todo.sh > output 2>&1 || test_cmp expect output
 '
@@ -23,24 +23,15 @@ EOF
 
 cat > test.cfg << EOF
 export TODO_DIR=.
-export TODO_FILE="\$TODO_DIR/todo.txt"
+export TODO_FILE="$TODO_DIR/todo.txt"
-export DONE_FILE="\$TODO_DIR/done.txt"
+export DONE_FILE="$TODO_DIR/done.txt"
-export REPORT_FILE="\$TODO_DIR/report.txt"
+export REPORT_FILE="$TODO_DIR/report.txt"
-export TMP_FILE="\$TODO_DIR/todo.tmp"
+export TMP_FILE="$TODO_DIR/todo.tmp"
 touch used_config
 EOF
 
 rm -f used_config
 test_expect_success 'config file (default location 1)' '
-    mkdir .todo
-    cp test.cfg .todo/config
-    todo.sh > output;
-    test_cmp expect output && test -f used_config &&
-        rm -rf .todo
-'
-
-rm -f used_config
-test_expect_success 'config file (default location 2)' '
     cp test.cfg todo.cfg
     todo.sh > output;
     test_cmp expect output && test -f used_config &&
@@ -48,7 +39,7 @@ test_expect_success 'config file (default location 2)' '
 '
 
 rm -f used_config
-test_expect_success 'config file (default location 3)' '
+test_expect_success 'config file (default location 2)' '
     cp test.cfg .todo.cfg
     todo.sh > output;
     test_cmp expect output && test -f used_config &&

tests/t0001-null.sh

@@ -12,7 +12,7 @@ when there are no todos.
 #
 cat > expect <<EOF
 --
-TODO: 0 of 0 tasks shown
+TODO: 0 of 0 tasks shown from $HOME/todo.txt
 EOF
 
 test_expect_success 'null ls' '
@@ -44,7 +44,7 @@ test_expect_success 'null listpri a' '
 #
 cat > expect <<EOF
 --
-TODO: 0 of 0 tasks shown
+TODO: 0 of 0 tasks shown from $HOME/todo.tmp
 EOF
 
 test_expect_success 'null lsa' '

tests/t1000-addlist.sh

@@ -1,72 +0,0 @@
-#!/bin/sh
-
-test_description='basic add and list functionality
-
-This test just makes sure the basic add and list
-command work, including support for filtering.
-'
-. ./test-lib.sh
-
-#
-# Add and list
-#
-test_todo_session 'basic add/list' <<EOF
->>> todo.sh add notice the daisies
-TODO: 'notice the daisies' added on line 1.
-
->>> todo.sh list
-1 notice the daisies
---
-TODO: 1 of 1 tasks shown
-
->>> todo.sh add smell the roses
-TODO: 'smell the roses' added on line 2.
-
->>> todo.sh list
-1 notice the daisies
-2 smell the roses
---
-TODO: 2 of 2 tasks shown
-EOF
-
-#
-# Filter
-#
-test_todo_session 'basic list filtering' <<EOF
->>> todo.sh list daisies
-1 notice the daisies
---
-TODO: 1 of 2 tasks shown
-
->>> todo.sh list smell
-2 smell the roses
---
-TODO: 1 of 2 tasks shown
-EOF
-
-test_todo_session 'case-insensitive filtering' <<EOF
->>> todo.sh add smell the uppercase Roses
-TODO: 'smell the uppercase Roses' added on line 3.
-
->>> todo.sh list roses
-2 smell the roses
-3 smell the uppercase Roses
---
-TODO: 2 of 3 tasks shown
-EOF
-
-test_todo_session 'add with &' <<EOF
->>> todo.sh add "dig the garden & water the flowers"
-TODO: 'dig the garden & water the flowers' added on line 4.
-
->>> todo.sh list
-4 dig the garden & water the flowers
-1 notice the daisies
-2 smell the roses
-3 smell the uppercase Roses
---
-TODO: 4 of 4 tasks shown
-
-EOF
-
-test_done

tests/t1010-add-date.sh

@@ -1,69 +0,0 @@
-#!/bin/sh
-
-test_description='test the date on add feature
-
-Tests paths by which we might automatically add
-a date to each item.
-'
-. ./test-lib.sh
-
-#
-# Add and list
-#
-test_todo_session 'cmd line first day' <<EOF
->>> todo.sh -t add notice the daisies
-TODO: '2009-02-13 notice the daisies' added on line 1.
-
->>> todo.sh list
-1 2009-02-13 notice the daisies
---
-TODO: 1 of 1 tasks shown
-EOF
-
-test_tick
-
-test_todo_session 'cmd line second day' <<EOF
->>> todo.sh -t add smell the roses
-TODO: '2009-02-14 smell the roses' added on line 2.
-
->>> todo.sh list
-1 2009-02-13 notice the daisies
-2 2009-02-14 smell the roses
---
-TODO: 2 of 2 tasks shown
-EOF
-
-test_tick
-
-test_todo_session 'cmd line third day' <<EOF
->>> todo.sh -t add mow the lawn
-TODO: '2009-02-15 mow the lawn' added on line 3.
-
->>> todo.sh list
-1 2009-02-13 notice the daisies
-2 2009-02-14 smell the roses
-3 2009-02-15 mow the lawn
---
-TODO: 3 of 3 tasks shown
-EOF
-
-# Switch to config file
-echo "export TODOTXT_DATE_ON_ADD=1" >> todo.cfg
-
-# Bump the clock, for good measure.
-test_tick 3600
-
-test_todo_session 'config file third day' <<EOF
->>> todo.sh add take out the trash
-TODO: '2009-02-15 take out the trash' added on line 4.
-
->>> todo.sh list
-1 2009-02-13 notice the daisies
-2 2009-02-14 smell the roses
-3 2009-02-15 mow the lawn
-4 2009-02-15 take out the trash
---
-TODO: 4 of 4 tasks shown
-EOF
-
-test_done

tests/t1020-addtolistfile.sh

@@ -1,78 +0,0 @@
-#!/bin/sh
-
-test_description='basic addto and list functionality
-
-This test just makes sure the basic addto and listfile
-commands work, including support for filtering.
-'
-. ./test-lib.sh
-
-#
-# Addto and listfile
-#
-test_todo_session 'nonexistant file' <<EOF
->>> todo.sh addto garden.txt notice the daisies
-TODO: Destination file $HOME/garden.txt does not exist.
-EOF
-
-touch "$HOME/garden.txt"
-
-test_todo_session 'basic addto/listfile' <<EOF
->>> todo.sh addto garden.txt notice the daisies
-GARDEN: 'notice the daisies' added on line 1.
-
->>> todo.sh listfile garden.txt
-1 notice the daisies
---
-GARDEN: 1 of 1 tasks shown
-
->>> todo.sh addto garden.txt smell the roses
-GARDEN: 'smell the roses' added on line 2.
-
->>> todo.sh listfile garden.txt
-1 notice the daisies
-2 smell the roses
---
-GARDEN: 2 of 2 tasks shown
-EOF
-
-#
-# Filter
-#
-test_todo_session 'basic listfile filtering' <<EOF
->>> todo.sh listfile garden.txt daisies
-1 notice the daisies
---
-GARDEN: 1 of 2 tasks shown
-
->>> todo.sh listfile garden.txt smell  
-2 smell the roses
---
-GARDEN: 1 of 2 tasks shown
-EOF
-
-test_todo_session 'case-insensitive filtering' <<EOF
->>> todo.sh addto garden.txt smell the uppercase Roses
-GARDEN: 'smell the uppercase Roses' added on line 3.
-
->>> todo.sh listfile garden.txt roses
-2 smell the roses
-3 smell the uppercase Roses
---
-GARDEN: 2 of 3 tasks shown
-EOF
-
-test_todo_session 'addto with &' <<EOF
->>> todo.sh addto garden.txt "dig the garden & water the flowers"
-GARDEN: 'dig the garden & water the flowers' added on line 4.
-
->>> todo.sh listfile garden.txt 
-4 dig the garden & water the flowers
-1 notice the daisies
-2 smell the roses
-3 smell the uppercase Roses
---
-GARDEN: 4 of 4 tasks shown
-EOF
-
-test_done

tests/t1030-addto-date.sh

@@ -1,71 +0,0 @@
-#!/bin/sh
-
-test_description='test the date on addto feature
-
-Tests paths by which we might automatically add
-a date to each item.
-'
-. ./test-lib.sh
-
-touch "$HOME/garden.txt"
-
-#
-# Add and list
-#
-test_todo_session 'cmd line first day' <<EOF
->>> todo.sh -t addto garden.txt notice the daisies
-GARDEN: '2009-02-13 notice the daisies' added on line 1.
-
->>> todo.sh listfile garden.txt
-1 2009-02-13 notice the daisies
---
-GARDEN: 1 of 1 tasks shown
-EOF
-
-test_tick
-
-test_todo_session 'cmd line second day' <<EOF
->>> todo.sh -t addto garden.txt smell the roses
-GARDEN: '2009-02-14 smell the roses' added on line 2.
-
->>> todo.sh listfile garden.txt
-1 2009-02-13 notice the daisies
-2 2009-02-14 smell the roses
---
-GARDEN: 2 of 2 tasks shown
-EOF
-
-test_tick
-
-test_todo_session 'cmd line third day' <<EOF
->>> todo.sh -t addto garden.txt mow the lawn
-GARDEN: '2009-02-15 mow the lawn' added on line 3.
-
->>> todo.sh listfile garden.txt
-1 2009-02-13 notice the daisies
-2 2009-02-14 smell the roses
-3 2009-02-15 mow the lawn
---
-GARDEN: 3 of 3 tasks shown
-EOF
-
-# Switch to config file
-echo "export TODOTXT_DATE_ON_ADD=1" >> todo.cfg
-
-# Bump the clock, for good measure.
-test_tick 3600
-
-test_todo_session 'config file third day' <<EOF
->>> todo.sh addto garden.txt take out the trash
-GARDEN: '2009-02-15 take out the trash' added on line 4.
-
->>> todo.sh listfile garden.txt
-1 2009-02-13 notice the daisies
-2 2009-02-14 smell the roses
-3 2009-02-15 mow the lawn
-4 2009-02-15 take out the trash
---
-GARDEN: 4 of 4 tasks shown
-EOF
-
-test_done

tests/t1100-replace.sh

@@ -1,93 +0,0 @@
-#!/bin/sh
-
-test_description='basic replace functionality
-
-Ensure we can replace items successfully.
-'
-. ./test-lib.sh
-
-#
-# Set up the basic todo.txt
-#
-todo.sh add notice the daisies > /dev/null
-
-test_todo_session 'replace usage' <<EOF
->>> todo.sh replace adf asdfa
-=== 1
-usage: todo.sh replace ITEM# "UPDATED ITEM"
-EOF
-
-test_todo_session 'basic replace' <<EOF
->>> todo.sh replace 1 "smell the cows"
-1: notice the daisies
-replaced with
-1: smell the cows
-
->>> todo.sh list
-1 smell the cows
---
-TODO: 1 of 1 tasks shown
-
->>> todo.sh replace 1 smell the roses
-1: smell the cows
-replaced with
-1: smell the roses
-
->>> todo.sh list
-1 smell the roses
---
-TODO: 1 of 1 tasks shown
-EOF
-
-cat > todo.txt <<EOF
-smell the cows
-grow some corn
-thrash some hay
-chase the chickens
-EOF
-test_todo_session 'replace in multi-item file' <<EOF
->>> todo.sh replace 1 smell the cheese
-1: smell the cows
-replaced with
-1: smell the cheese
-
->>> todo.sh replace 3 jump on hay
-3: thrash some hay
-replaced with
-3: jump on hay
-
->>> todo.sh replace 4 collect the eggs
-4: chase the chickens
-replaced with
-4: collect the eggs
-EOF
-
-test_todo_session 'replace with priority' <<EOF
->>> todo.sh pri 4 a
-4: (A) collect the eggs
-TODO: 4 prioritized (A).
-
->>> todo.sh replace 4 "collect the bread"
-4: (A) collect the eggs
-replaced with
-4: (A) collect the bread
-
->>> todo.sh replace 4 collect the eggs
-4: (A) collect the bread
-replaced with
-4: (A) collect the eggs
-EOF
-test_todo_session 'replace with &' << EOF
->>> todo.sh replace 3 "thrash the hay & thresh the wheat"
-3: jump on hay
-replaced with 
-3: thrash the hay & thresh the wheat
-EOF
-
-test_todo_session 'replace error' << EOF
->>> todo.sh replace 10 "hej!"
-=== 1
-10: No such todo.
-EOF
-
-test_done

tests/t1200-pri.sh

@@ -1,89 +0,0 @@
-#!/bin/sh
-
-test_description='basic priority functionality
-'
-. ./test-lib.sh
-
-test_todo_session 'priority usage' <<EOF
->>> todo.sh pri B B
-usage: todo.sh pri ITEM# PRIORITY
-note: PRIORITY must be anywhere from A to Z.
-=== 1
-EOF
-
-cat > todo.txt <<EOF
-smell the uppercase Roses +flowers @outside
-notice the sunflowers
-stop
-EOF
-test_todo_session 'basic priority' <<EOF
->>> todo.sh list
-2 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh pri 1 B
-1: (B) smell the uppercase Roses +flowers @outside
-TODO: 1 prioritized (B).
-
->>> todo.sh list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh pri 2 C
-2: (C) notice the sunflowers
-TODO: 2 prioritized (C).
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 (C) notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh pri 2 A
-2: (A) notice the sunflowers
-TODO: 2 prioritized (A).
-
->>> 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 pri 2 a
-2: (A) notice the sunflowers
-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"
-TODO: 'smell the coffee +wakeup' added on line 4.
-
->>> 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: 4 of 4 tasks shown
-EOF
-
-test_done

tests/t1300-ls.sh

@@ -1,623 +0,0 @@
-#!/bin/sh
-#
-
-test_description='list functionality
-
-This test checks various list functionality including
-sorting, output filtering and line numbering.
-'
-. ./test-lib.sh
-
-TEST_TODO_=todo.cfg
-
-cat > todo.txt <<EOF
-ccc xxx this line should be third.
-aaa zzz this line should be first.
-bbb yyy this line should be second.
-EOF
-
-#
-# check the sort filter
-#
-TEST_TODO1_=todo1.cfg
-sed -e "s/^.*export TODOTXT_SORT_COMMAND=.*$/export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -r -f -k2'/" "${TEST_TODO_}" > "${TEST_TODO1_}"
-
-test_todo_session 'checking TODOTXT_SORT_COMMAND' <<EOF
->>> todo.sh ls
-2 aaa zzz this line should be first.
-3 bbb yyy this line should be second.
-1 ccc xxx this line should be third.
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh -d "$TEST_TODO1_" ls
-1 ccc xxx this line should be third.
-3 bbb yyy this line should be second.
-2 aaa zzz this line should be first.
---
-TODO: 3 of 3 tasks shown
-EOF
-
-#
-# check the final filter
-#
-TEST_TODO2_=todo2.cfg
-sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"sed 's/^\\\(..\\\{20\\\}\\\).....*$/\\\1.../'\"%" "${TEST_TODO_}" > "${TEST_TODO2_}"
-
-test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
->>> todo.sh -d "$TEST_TODO2_" ls
-2 aaa zzz this line s...
-3 bbb yyy this line s...
-1 ccc xxx this line s...
---
-TODO: 3 of 3 tasks shown
-EOF
-
-#
-# check the x command line option
-#
-TEST_TODO3_=todo3.cfg
-sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"grep -v xxx\"%" "${TEST_TODO_}" > "${TEST_TODO3_}"
-
-cat > todo.txt <<EOF
-foo
-bar xxx
-baz
-EOF
-
-test_todo_session 'final filter suppression' <<EOF
->>> todo.sh -d "$TEST_TODO3_" ls
-3 baz
-1 foo
---
-TODO: 2 of 3 tasks shown
-
->>> todo.sh -d "$TEST_TODO3_" -x ls
-2 bar xxx
-3 baz
-1 foo
---
-TODO: 3 of 3 tasks shown
-EOF
-
-#
-# check the p command line option
-#
-cat > todo.txt <<EOF
-(A) @con01 +prj01 -- Some project 01 task, pri A
-(A) @con01 +prj02 -- Some project 02 task, pri A
-(A) @con02 +prj03 -- Some project 03 task, pri A
-(A) @con02 +prj04 -- Some project 04 task, pri A
-(B) @con01 +prj01 -- Some project 01 task, pri B
-(B) @con01 +prj02 -- Some project 02 task, pri B
-(B) @con02 +prj03 -- Some project 03 task, pri B
-(B) @con02 +prj04 -- Some project 04 task, pri B
-(C) @con01 +prj01 -- Some project 01 task, pri C
-(C) @con01 +prj02 -- Some project 02 task, pri C
-(C) @con02 +prj03 -- Some project 03 task, pri C
-(C) @con02 +prj04 -- Some project 04 task, pri C
-(D) @con01 +prj01 -- Some project 01 task, pri D
-(D) @con01 +prj02 -- Some project 02 task, pri D
-(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 02 task, no priority
-@con02 +prj03 -- Some project 03 task, no priorty
-@con02 +prj04 -- Some project 04 task, no priority
-EOF
-test_todo_session 'plain mode option' <<EOF
->>> todo.sh ls
-01 (A) @con01 +prj01 -- Some project 01 task, pri A
-02 (A) @con01 +prj02 -- Some project 02 task, pri A
-03 (A) @con02 +prj03 -- Some project 03 task, pri A
-04 (A) @con02 +prj04 -- Some project 04 task, pri A
-05 (B) @con01 +prj01 -- Some project 01 task, pri B
-06 (B) @con01 +prj02 -- Some project 02 task, pri B
-07 (B) @con02 +prj03 -- Some project 03 task, pri B
-08 (B) @con02 +prj04 -- Some project 04 task, pri B
-09 (C) @con01 +prj01 -- Some project 01 task, pri C
-10 (C) @con01 +prj02 -- Some project 02 task, pri C
-11 (C) @con02 +prj03 -- Some project 03 task, pri C
-12 (C) @con02 +prj04 -- Some project 04 task, pri C
-13 (D) @con01 +prj01 -- Some project 01 task, pri D
-14 (D) @con01 +prj02 -- Some project 02 task, pri D
-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 02 task, no priority
-19 @con02 +prj03 -- Some project 03 task, no priorty
-20 @con02 +prj04 -- Some project 04 task, no priority
---
-TODO: 20 of 20 tasks shown
-
->>> todo.sh -p ls
-01 (A) @con01 +prj01 -- Some project 01 task, pri A
-02 (A) @con01 +prj02 -- Some project 02 task, pri A
-03 (A) @con02 +prj03 -- Some project 03 task, pri A
-04 (A) @con02 +prj04 -- Some project 04 task, pri A
-05 (B) @con01 +prj01 -- Some project 01 task, pri B
-06 (B) @con01 +prj02 -- Some project 02 task, pri B
-07 (B) @con02 +prj03 -- Some project 03 task, pri B
-08 (B) @con02 +prj04 -- Some project 04 task, pri B
-09 (C) @con01 +prj01 -- Some project 01 task, pri C
-10 (C) @con01 +prj02 -- Some project 02 task, pri C
-11 (C) @con02 +prj03 -- Some project 03 task, pri C
-12 (C) @con02 +prj04 -- Some project 04 task, pri C
-13 (D) @con01 +prj01 -- Some project 01 task, pri D
-14 (D) @con01 +prj02 -- Some project 02 task, pri D
-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 02 task, no priority
-19 @con02 +prj03 -- Some project 03 task, no priorty
-20 @con02 +prj04 -- Some project 04 task, no priority
---
-TODO: 20 of 20 tasks shown
-EOF
-
-#
-# check the P,@,+ command line options
-#
-cat > todo.txt <<EOF
-(A) @con01 +prj01 -- Some project 01 task, pri A
-(A) @con01 +prj02 -- Some project 02 task, pri A
-(A) @con02 +prj03 -- Some project 03 task, pri A
-(A) @con02 +prj04 -- Some project 04 task, pri A
-(B) @con01 +prj01 -- Some project 01 task, pri B
-(B) @con01 +prj02 -- Some project 02 task, pri B
-(B) @con02 +prj03 -- Some project 03 task, pri B
-(B) @con02 +prj04 -- Some project 04 task, pri B
-(C) @con01 +prj01 -- Some project 01 task, pri C
-(C) @con01 +prj02 -- Some project 02 task, pri C
-(C) @con02 +prj03 -- Some project 03 task, pri C
-(C) @con02 +prj04 -- Some project 04 task, pri C
-(D) @con01 +prj01 -- Some project 01 task, pri D
-(D) @con01 +prj02 -- Some project 02 task, pri D
-(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 02 task, no priority
-@con02 +prj03 -- Some project 03 task, no priorty
-@con02 +prj04 -- Some project 04 task, no priority
-EOF
-test_todo_session 'context, project, and priority suppression' <<EOF
->>> todo.sh ls
-01 (A) @con01 +prj01 -- Some project 01 task, pri A
-02 (A) @con01 +prj02 -- Some project 02 task, pri A
-03 (A) @con02 +prj03 -- Some project 03 task, pri A
-04 (A) @con02 +prj04 -- Some project 04 task, pri A
-05 (B) @con01 +prj01 -- Some project 01 task, pri B
-06 (B) @con01 +prj02 -- Some project 02 task, pri B
-07 (B) @con02 +prj03 -- Some project 03 task, pri B
-08 (B) @con02 +prj04 -- Some project 04 task, pri B
-09 (C) @con01 +prj01 -- Some project 01 task, pri C
-10 (C) @con01 +prj02 -- Some project 02 task, pri C
-11 (C) @con02 +prj03 -- Some project 03 task, pri C
-12 (C) @con02 +prj04 -- Some project 04 task, pri C
-13 (D) @con01 +prj01 -- Some project 01 task, pri D
-14 (D) @con01 +prj02 -- Some project 02 task, pri D
-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 02 task, no priority
-19 @con02 +prj03 -- Some project 03 task, no priorty
-20 @con02 +prj04 -- Some project 04 task, no priority
---
-TODO: 20 of 20 tasks shown
-
->>> todo.sh ls @con01
-01 (A) @con01 +prj01 -- Some project 01 task, pri A
-02 (A) @con01 +prj02 -- Some project 02 task, pri A
-05 (B) @con01 +prj01 -- Some project 01 task, pri B
-06 (B) @con01 +prj02 -- Some project 02 task, pri B
-09 (C) @con01 +prj01 -- Some project 01 task, pri C
-10 (C) @con01 +prj02 -- Some project 02 task, pri C
-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 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-
->>> todo.sh -P ls @con01
-01 @con01 +prj01 -- Some project 01 task, pri A
-02 @con01 +prj02 -- Some project 02 task, pri A
-05 @con01 +prj01 -- Some project 01 task, pri B
-06 @con01 +prj02 -- Some project 02 task, pri B
-09 @con01 +prj01 -- Some project 01 task, pri C
-10 @con01 +prj02 -- Some project 02 task, pri C
-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 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-
->>> todo.sh -+ ls @con01
-01 (A) @con01 -- Some project 01 task, pri A
-02 (A) @con01 -- Some project 02 task, pri A
-05 (B) @con01 -- Some project 01 task, pri B
-06 (B) @con01 -- Some project 02 task, pri B
-09 (C) @con01 -- Some project 01 task, pri C
-10 (C) @con01 -- Some project 02 task, pri C
-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 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-
->>> todo.sh -@ ls @con01
-01 (A) +prj01 -- Some project 01 task, pri A
-02 (A) +prj02 -- Some project 02 task, pri A
-05 (B) +prj01 -- Some project 01 task, pri B
-06 (B) +prj02 -- Some project 02 task, pri B
-09 (C) +prj01 -- Some project 01 task, pri C
-10 (C) +prj02 -- Some project 02 task, pri C
-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 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-
->>> todo.sh -P -@ ls @con01
-01 +prj01 -- Some project 01 task, pri A
-02 +prj02 -- Some project 02 task, pri A
-05 +prj01 -- Some project 01 task, pri B
-06 +prj02 -- Some project 02 task, pri B
-09 +prj01 -- Some project 01 task, pri C
-10 +prj02 -- Some project 02 task, pri C
-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 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-
->>> todo.sh -P -@ -+ -P -@ -+ ls @con01
-01 (A) @con01 +prj01 -- Some project 01 task, pri A
-02 (A) @con01 +prj02 -- Some project 02 task, pri A
-05 (B) @con01 +prj01 -- Some project 01 task, pri B
-06 (B) @con01 +prj02 -- Some project 02 task, pri B
-09 (C) @con01 +prj01 -- Some project 01 task, pri C
-10 (C) @con01 +prj02 -- Some project 02 task, pri C
-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 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-
->>> todo.sh -P -@ -+ -P -@ -+ -P -@ -+ ls @con01
-01 -- Some project 01 task, pri A
-02 -- Some project 02 task, pri A
-05 -- Some project 01 task, pri B
-06 -- Some project 02 task, pri B
-09 -- Some project 01 task, pri C
-10 -- Some project 02 task, pri C
-13 -- Some project 01 task, pri D
-14 -- Some project 02 task, pri D
-17 -- Some project 01 task, no priority
-18 -- Some project 02 task, no priority
---
-TODO: 10 of 20 tasks shown
-EOF
-
-#
-# check the line number padding
-#
-cat > todo.txt <<EOF
-hex00 this is one line
-hex01 this is another line
-hex02 this is another line
-hex03 this is another line
-hex04 this is another line
-hex05 this is another line
-hex06 this is another line
-hex07 this is another line
-hex08 this is another line
-hex09 this is another line
-hex0A this is another line
-hex0B this is another line
-hex0C this is another line
-hex0D this is another line
-hex0E this is another line
-hex0F this is another line
-hex10 this is line is a multiple of 16
-hex11 this is another line
-hex12 this is another line
-hex13 this is another line
-hex14 this is another line
-hex15 this is another line
-hex16 this is another line
-hex17 this is another line
-hex18 this is another line
-hex19 this is another line
-hex1A this is another line
-hex1B this is another line
-hex1C this is another line
-hex1D this is another line
-hex1E this is another line
-hex1F this is another line
-hex20 this is line is a multiple of 16
-hex21 this is another line
-hex22 this is another line
-hex23 this is another line
-hex24 this is another line
-hex25 this is another line
-hex26 this is another line
-hex27 this is another line
-hex28 this is another line
-hex29 this is another line
-hex2A this is another line
-hex2B this is another line
-hex2C this is another line
-hex2D this is another line
-hex2E this is another line
-hex2F this is another line
-hex30 this is line is a multiple of 16
-hex31 this is another line
-hex32 this is another line
-hex33 this is another line
-hex34 this is another line
-hex35 this is another line
-hex36 this is another line
-hex37 this is another line
-hex38 this is another line
-hex39 this is another line
-hex3A this is another line
-hex3B this is another line
-hex3C this is another line
-hex3D this is another line
-hex3E this is another line
-hex3F this is another line
-hex40 this is line is a multiple of 16
-hex41 this is another line
-hex42 this is another line
-hex43 this is another line
-hex44 this is another line
-hex45 this is another line
-hex46 this is another line
-hex47 this is another line
-hex48 this is another line
-hex49 this is another line
-hex4A this is another line
-hex4B this is another line
-hex4C this is another line
-hex4D this is another line
-hex4E this is another line
-hex4F this is another line
-hex50 this is line is a multiple of 16
-hex51 this is another line
-hex52 this is another line
-hex53 this is another line
-hex54 this is another line
-hex55 this is another line
-hex56 this is another line
-hex57 this is another line
-hex58 this is another line
-hex59 this is another line
-hex5A this is another line
-hex5B this is another line
-hex5C this is another line
-hex5D this is another line
-hex5E this is another line
-hex5F this is another line
-hex60 this is line is a multiple of 16
-hex61 this is another line
-hex62 this is another line
-hex63 this is another line
-hex64 this is another line
-hex65 this is another line
-hex66 this is another line
-hex67 this is another line
-hex68 this is another line
-hex69 this is another line
-hex6A this is another line
-hex6B this is another line
-hex6C this is another line
-hex6D this is another line
-hex6E this is another line
-hex6F this is another line
-EOF
-test_todo_session 'check line number padding, out to 3 digits' <<EOF
->>> todo.sh ls
-001 hex00 this is one line
-002 hex01 this is another line
-003 hex02 this is another line
-004 hex03 this is another line
-005 hex04 this is another line
-006 hex05 this is another line
-007 hex06 this is another line
-008 hex07 this is another line
-009 hex08 this is another line
-010 hex09 this is another line
-011 hex0A this is another line
-012 hex0B this is another line
-013 hex0C this is another line
-014 hex0D this is another line
-015 hex0E this is another line
-016 hex0F this is another line
-017 hex10 this is line is a multiple of 16
-018 hex11 this is another line
-019 hex12 this is another line
-020 hex13 this is another line
-021 hex14 this is another line
-022 hex15 this is another line
-023 hex16 this is another line
-024 hex17 this is another line
-025 hex18 this is another line
-026 hex19 this is another line
-027 hex1A this is another line
-028 hex1B this is another line
-029 hex1C this is another line
-030 hex1D this is another line
-031 hex1E this is another line
-032 hex1F this is another line
-033 hex20 this is line is a multiple of 16
-034 hex21 this is another line
-035 hex22 this is another line
-036 hex23 this is another line
-037 hex24 this is another line
-038 hex25 this is another line
-039 hex26 this is another line
-040 hex27 this is another line
-041 hex28 this is another line
-042 hex29 this is another line
-043 hex2A this is another line
-044 hex2B this is another line
-045 hex2C this is another line
-046 hex2D this is another line
-047 hex2E this is another line
-048 hex2F this is another line
-049 hex30 this is line is a multiple of 16
-050 hex31 this is another line
-051 hex32 this is another line
-052 hex33 this is another line
-053 hex34 this is another line
-054 hex35 this is another line
-055 hex36 this is another line
-056 hex37 this is another line
-057 hex38 this is another line
-058 hex39 this is another line
-059 hex3A this is another line
-060 hex3B this is another line
-061 hex3C this is another line
-062 hex3D this is another line
-063 hex3E this is another line
-064 hex3F this is another line
-065 hex40 this is line is a multiple of 16
-066 hex41 this is another line
-067 hex42 this is another line
-068 hex43 this is another line
-069 hex44 this is another line
-070 hex45 this is another line
-071 hex46 this is another line
-072 hex47 this is another line
-073 hex48 this is another line
-074 hex49 this is another line
-075 hex4A this is another line
-076 hex4B this is another line
-077 hex4C this is another line
-078 hex4D this is another line
-079 hex4E this is another line
-080 hex4F this is another line
-081 hex50 this is line is a multiple of 16
-082 hex51 this is another line
-083 hex52 this is another line
-084 hex53 this is another line
-085 hex54 this is another line
-086 hex55 this is another line
-087 hex56 this is another line
-088 hex57 this is another line
-089 hex58 this is another line
-090 hex59 this is another line
-091 hex5A this is another line
-092 hex5B this is another line
-093 hex5C this is another line
-094 hex5D this is another line
-095 hex5E this is another line
-096 hex5F this is another line
-097 hex60 this is line is a multiple of 16
-098 hex61 this is another line
-099 hex62 this is another line
-100 hex63 this is another line
-101 hex64 this is another line
-102 hex65 this is another line
-103 hex66 this is another line
-104 hex67 this is another line
-105 hex68 this is another line
-106 hex69 this is another line
-107 hex6A this is another line
-108 hex6B this is another line
-109 hex6C this is another line
-110 hex6D this is another line
-111 hex6E this is another line
-112 hex6F this is another line
---
-TODO: 112 of 112 tasks shown
-EOF
-
-#
-# check that blank lines are ignored.
-#
-
-# Less than 10
-cat > todo.txt <<EOF
-hex00 this is one line
-
-hex02 this is another line
-hex03 this is another line
-hex04 this is another line
-hex05 this is another line
-hex06 this is another line
-hex07 this is another line
-EOF
-test_todo_session 'check that blank lines are ignored for less than 10 items' <<EOF
->>> todo.sh ls
-1 hex00 this is one line
-3 hex02 this is another line
-4 hex03 this is another line
-5 hex04 this is another line
-6 hex05 this is another line
-7 hex06 this is another line
-8 hex07 this is another line
---
-TODO: 7 of 7 tasks shown
-EOF
-
-# More than 10
-cat > todo.txt <<EOF
-hex00 this is one line
-
-hex02 this is another line
-hex03 this is another line
-hex04 this is another line
-hex05 this is another line
-hex06 this is another line
-hex07 this is another line
-hex08 this is another line
-hex09 this is another line
-EOF
-test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (one blank)' <<EOF
->>> todo.sh ls
-01 hex00 this is one line
-03 hex02 this is another line
-04 hex03 this is another line
-05 hex04 this is another line
-06 hex05 this is another line
-07 hex06 this is another line
-08 hex07 this is another line
-09 hex08 this is another line
-10 hex09 this is another line
---
-TODO: 9 of 9 tasks shown
-EOF
-cat > todo.txt <<EOF
-hex00 this is one line
-
-hex02 this is another line
-hex03 this is another line
-hex04 this is another line
-hex05 this is another line
-
-hex07 this is another line
-hex08 this is another line
-hex09 this is another line
-EOF
-test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (many blanks)' <<EOF
->>> todo.sh ls
-01 hex00 this is one line
-03 hex02 this is another line
-04 hex03 this is another line
-05 hex04 this is another line
-06 hex05 this is another line
-08 hex07 this is another line
-09 hex08 this is another line
-10 hex09 this is another line
---
-TODO: 8 of 8 tasks shown
-EOF
-
-test_done

tests/t1310-listcon.sh

@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-
-test_description='listcon functionality
-
-This test checks basic context listing functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-item 1
-item 2
-item 3
-EOF
-test_expect_success 'listcon no contexts' '
-    todo.sh listcon > output && ! test -s output
-'
-
-cat > todo.txt <<EOF
-(A) @1 -- Some context 1 task, whitespace, one char
-(A) @c2 -- Some context 2 task, whitespace, two char
-@con03 -- Some context 3 task, no whitespace
-@con04 -- Some context 4 task, no whitespace
-@con05@con06 -- weird context
-EOF
-test_todo_session 'Single context per line' <<EOF
->>> todo.sh listcon
-@1
-@c2
-@con03
-@con04
-@con05@con06
-EOF
-
-cat > todo.txt <<EOF
-@con01 -- Some context 1 task
-@con02 -- Some context 2 task
-@con02 @con03 -- Multi-context task
-EOF
-test_todo_session 'Multi-context per line' <<EOF
->>> todo.sh listcon
-@con01
-@con02
-@con03
-EOF
-
-cat > todo.txt <<EOF
-@con01 -- Some context 1 task
-@con02 -- Some context 2 task
-@con02 ginatrapani@gmail.com -- Some context 2 task
-EOF
-test_todo_session 'listcon e-mail address test' <<EOF
->>> todo.sh listcon
-@con01
-@con02
-EOF
-
-test_done

tests/t1320-listproj.sh

@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-
-test_description='listproj functionality
-
-This test checks basic project listing functionality
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-item 1
-item 2
-item 3
-EOF
-test_expect_success 'listproj no projects' '
-    todo.sh listproj > output && ! test -s output
-'
-
-cat > todo.txt <<EOF
-(A) +1 -- Some project 1 task, whitespace, one char
-(A) +p2 -- Some project 2 task, whitespace, two char
-+prj03 -- Some project 3 task, no whitespace
-+prj04 -- Some project 4 task, no whitespace
-+prj05+prj06 -- weird project
-EOF
-test_todo_session 'Single project per line' <<EOF
->>> todo.sh listproj
-+1
-+p2
-+prj03
-+prj04
-+prj05+prj06
-EOF
-
-cat > todo.txt <<EOF
-+prj01 -- Some project 1 task
-+prj02 -- Some project 2 task
-+prj02 +prj03 -- Multi-project task
-EOF
-test_todo_session 'Multi-project per line' <<EOF
->>> todo.sh listproj
-+prj01
-+prj02
-+prj03
-EOF
-
-cat > todo.txt <<EOF
-+prj01 -- Some project 1 task
-+prj02 -- Some project 2 task
-+prj02 ginatrapani+todo@gmail.com -- Some project 2 task
-EOF
-test_todo_session 'listproj embedded + test' <<EOF
->>> todo.sh listproj
-+prj01
-+prj02
-EOF
-
-test_done

tests/t1400-prepend.sh

@@ -1,60 +0,0 @@
-#!/bin/sh
-
-test_description='basic prepend functionality
-'
-. ./test-lib.sh
-
-test_todo_session 'prepend usage' <<EOF
->>> todo.sh prepend B B
-usage: todo.sh prepend ITEM# "TEXT TO PREPEND"
-=== 1
-EOF
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-notice the sunflowers
-stop
-EOF
-test_todo_session 'basic prepend' <<EOF
->>> todo.sh list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-2 notice the sunflowers
-3 stop
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh prepend 2 test
-2: test notice the sunflowers
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-3 stop
-2 test notice the sunflowers
---
-TODO: 3 of 3 tasks shown
-
->>> todo.sh prepend 1 test
-1: (B) test smell the uppercase Roses +flowers @outside
-
->>> todo.sh -p list
-1 (B) test smell the uppercase Roses +flowers @outside
-3 stop
-2 test notice the sunflowers
---
-TODO: 3 of 3 tasks shown
-
-EOF
-
-test_todo_session 'prepend with &' <<EOF
->>> todo.sh prepend 3 "no running & jumping now"
-3: no running & jumping now stop
-EOF
-
-test_done

tests/t1500-do.sh

@@ -1,80 +0,0 @@
-#!/bin/sh
-
-test_description='do functionality
-'
-. ./test-lib.sh
-
-#DATE=`date '+%Y-%m-%d'`
-
-test_todo_session 'do usage' <<EOF
->>> todo.sh do B B
-usage: todo.sh do ITEM#
-=== 1
-EOF
-
-cat > todo.txt <<EOF
-smell the uppercase Roses +flowers @outside
-notice the sunflowers
-stop
-remove1
-remove2
-remove3
-remove4
-EOF
-
-test_todo_session 'basic do' <<EOF
->>> todo.sh list
-2 notice the sunflowers
-4 remove1
-5 remove2
-6 remove3
-7 remove4
-1 smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 7 of 7 tasks shown
-
->>> todo.sh do 7,6
-7: x 2009-02-13 remove4
-TODO: 7 marked as done.
-6: x 2009-02-13 remove3
-TODO: 6 marked as done.
-x 2009-02-13 remove3
-x 2009-02-13 remove4
-TODO: $HOME/todo.txt archived.
-
->>> todo.sh -p list
-2 notice the sunflowers
-4 remove1
-5 remove2
-1 smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 5 of 5 tasks shown
-
->>> todo.sh do 5 4
-5: x 2009-02-13 remove2
-TODO: 5 marked as done.
-4: x 2009-02-13 remove1
-TODO: 4 marked as done.
-x 2009-02-13 remove1
-x 2009-02-13 remove2
-TODO: $HOME/todo.txt archived.
-
->>> todo.sh -p list
-2 notice the sunflowers
-1 smell the uppercase Roses +flowers @outside
-3 stop
---
-TODO: 3 of 3 tasks shown
-EOF
-
-test_todo_session 'fail multiple do attempts' <<EOF
->>> todo.sh -a do 3
-3: x 2009-02-13 stop
-TODO: 3 marked as done.
-
->>> todo.sh -a do 3
-3 is already marked done
-EOF
-test_done

tests/t1600-append.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-test_description='basic append functionality
-
-Ensure we can append items successfully.
-'
-. ./test-lib.sh
-
-#
-# Set up the basic todo.txt
-#
-todo.sh add notice the daisies > /dev/null
-
-test_todo_session 'append usage' <<EOF
->>> todo.sh append adf asdfa
-=== 1
-usage: todo.sh append ITEM# "TEXT TO APPEND"
-EOF
-
-test_todo_session 'basic append' <<EOF
->>> todo.sh append 1 "smell the roses"
-1: notice the daisies smell the roses
-
->>> todo.sh list
-1 notice the daisies smell the roses
---
-TODO: 1 of 1 tasks shown
-EOF
-
-test_todo_session 'basic append with &' <<EOF
->>> todo.sh append 1 "see the wasps & bees"
-1: notice the daisies smell the roses see the wasps & bees
-
->>> todo.sh list
-1 notice the daisies smell the roses see the wasps & bees
---
-TODO: 1 of 1 tasks shown
-EOF
-
-
-test_todo_session 'append error' << EOF
->>> todo.sh append 10 "hej!"
-=== 1
-10: No such todo.
-EOF
-
-test_done

tests/t2000-multiline.sh

@@ -1,132 +0,0 @@
-#!/bin/sh
-
-test_description='Multi-line functionality'
-
-. ./test-lib.sh
-
-## Replace test
-# Create the expected file
-echo "1: smell the cheese
-replaced with
-1: eat apples eat oranges drink milk">$HOME/expect.multi
-
-test_expect_success 'multiline squash item replace' '
-(
-# Prepare single line todo file
-cat /dev/null > $HOME/todo.txt
-"$HOME/bin/todo.sh" add smell the cheese
-
-# Run replace
-"$HOME/bin/todo.sh" replace 1 "eat apples
-eat oranges
-drink milk" > $HOME/output.multi
-
-# Test output against expected
-diff "$HOME/output.multi" "$HOME/expect.multi"
-if [ $? -ne 0 ]; then
-  exit 1
-else
-  exit 0
-fi
-)
-'
-
-## Add test
-# Create the expected file
-echo "TODO: 'eat apples eat oranges drink milk' added on line 2.">$HOME/expect.multi
-
-test_expect_success 'multiline squash item add' '
-(
-# Prepare single line todo file
-cat /dev/null > $HOME/todo.txt
-"$HOME/bin/todo.sh" add smell the cheese
-
-# Run add
-"$HOME/bin/todo.sh" add "eat apples
-eat oranges
-drink milk" > $HOME/output.multi
-
-# Test output against expected
-diff "$HOME/output.multi" "$HOME/expect.multi"
-if [ $? -ne 0 ]; then
-  exit 1
-else
-  exit 0
-fi
-)
-'
-
-## Append test
-# Create the expected file
-echo "1: smell the cheese eat apples eat oranges drink milk">$HOME/expect.multi
-
-test_expect_success 'multiline squash item append' '
-(
-# Prepare single line todo file
-cat /dev/null > $HOME/todo.txt
-"$HOME/bin/todo.sh" add smell the cheese
-
-# Run append
-"$HOME/bin/todo.sh" append 1 "eat apples
-eat oranges
-drink milk" > $HOME/output.multi
-
-# Test output against expected
-diff "$HOME/output.multi" "$HOME/expect.multi"
-if [ $? -ne 0 ]; then
-  exit 1
-else
-  exit 0
-fi
-)
-'
-
-## Prepend test
-# Create the expected file
-echo "1: eat apples eat oranges drink milk smell the cheese">$HOME/expect.multi
-
-test_expect_success 'multiline squash item prepend' '
-(
-# Prepare single line todo file
-cat /dev/null > $HOME/todo.txt
-"$HOME/bin/todo.sh" add smell the cheese
-
-# Run prepend
-"$HOME/bin/todo.sh" prepend 1 "eat apples
-eat oranges
-drink milk" > $HOME/output.multi
-
-# Test output against expected
-diff "$HOME/output.multi" "$HOME/expect.multi"
-if [ $? -ne 0 ]; then
-  exit 1
-else
-  exit 0
-fi
-)
-'
-
-## Multiple line addition
-# Create the expected file
-echo "TODO: 'eat apples' added on line 2." > $HOME/expect.multi
-echo "TODO: 'eat oranges' added on line 3." >>$HOME/expect.multi
-echo "TODO: 'drink milk' added on line 4." >> $HOME/expect.multi
-
-test_expect_success 'actual multiline add' '
-(
-# Run addm
-"$HOME/bin/todo.sh" addm "eat apples
-eat oranges
-drink milk" > $HOME/output.multi
-
-# Test output against expected
-diff "$HOME/output.multi" "$HOME/expect.multi"
-if [ $? -ne 0 ]; then
-  exit 1
-else
-  exit 0
-fi
-)
-'
-
-test_done

tests/t9999-testsuite_example.sh

@@ -1,168 +0,0 @@
-#!/bin/sh
-
-test_description='basic tests imported from previous framework
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(A) notice the sunflowers
-stop
-smell the coffee +wakeup
-EOF
-test_todo_session 'basic tests' <<EOF
->>> 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: 4 of 4 tasks shown
-
->>> todo.sh -p list +flowers
-1 (B) smell the uppercase Roses +flowers @outside
---
-TODO: 1 of 4 tasks shown
-
->>> todo.sh -p list flowers
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
---
-TODO: 2 of 4 tasks shown
-
->>> todo.sh -p list flowers out
-1 (B) smell the uppercase Roses +flowers @outside
---
-TODO: 1 of 4 tasks shown
-
->>> todo.sh -a do 2
-2: x 2009-02-13 notice the sunflowers
-TODO: 2 marked as done.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 smell the coffee +wakeup
-3 stop
-2 x 2009-02-13 notice the sunflowers
---
-TODO: 4 of 4 tasks shown
-
->>> todo.sh add "make the coffee +wakeup"
-TODO: 'make the coffee +wakeup' added on line 5.
-
->>> todo.sh -p list coffee
-5 make the coffee +wakeup
-4 smell the coffee +wakeup
---
-TODO: 2 of 5 tasks shown
-
->>> todo.sh add "visit http://example.com"
-TODO: 'visit http://example.com' added on line 6.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-5 make the coffee +wakeup
-4 smell the coffee +wakeup
-3 stop
-6 visit http://example.com
-2 x 2009-02-13 notice the sunflowers
---
-TODO: 6 of 6 tasks shown
-
->>> todo.sh archive
-x 2009-02-13 notice the sunflowers
-TODO: $HOME/todo.txt archived.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop
-5 visit http://example.com
---
-TODO: 5 of 5 tasks shown
-
->>> todo.sh report
-TODO: Report file updated.
-2009-02-13-04:40:00 5 1
-
->>> todo.sh report
-TODO: Report file updated.
-2009-02-13-04:40:00 5 1
-2009-02-13-04:40:00 5 1
-
->>> todo.sh append g a
-usage: todo.sh append ITEM# "TEXT TO APPEND"
-=== 1
-
->>> todo.sh append 2 and think
-2: stop and think
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop and think
-5 visit http://example.com
---
-TODO: 5 of 5 tasks shown
-
->>> todo.sh append 10 "hej!"
-10: No such todo.
-=== 1
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop and think
-5 visit http://example.com
---
-TODO: 5 of 5 tasks shown
-
->>> todo.sh do 10
-10: No such todo.
-=== 1
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop and think
-5 visit http://example.com
---
-TODO: 5 of 5 tasks shown
-
->>> todo.sh add "the coffee +wakeup"
-TODO: 'the coffee +wakeup' added on line 6.
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop and think
-6 the coffee +wakeup
-5 visit http://example.com
---
-TODO: 6 of 6 tasks shown
-
->>> todo.sh prepend 6 "make"
-6: make the coffee +wakeup
-
->>> todo.sh -p list
-1 (B) smell the uppercase Roses +flowers @outside
-4 make the coffee +wakeup
-6 make the coffee +wakeup
-3 smell the coffee +wakeup
-2 stop and think
-5 visit http://example.com
---
-TODO: 6 of 6 tasks shown
-
->>> todo.sh remdup
-Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
-Try 'todo.sh -h' for more information.
-=== 1
-EOF
-
-test_done

tests/test-lib.sh

@@ -37,9 +37,7 @@ VISUAL=:
 unset CDPATH
 
 # Protect ourselves from using predefined TODOTXT_CFG_FILE
-unset TODOTXT_CFG_FILE $(set|sed '/^TODOTXT_/!d;s/=.*//')
+unset TODOTXT_CFG_FILE
-# To prevent any damage if someone has still those exported somehow in his env:
-unset TODO_FILE DONE_FILE REPORT_FILE TMP_FILE
 
 # Each test should start with something like this, after copyright notices:
 #
@@ -409,12 +407,9 @@ test_done () {
 	esac
 }
 
-# Use -P to resolve symlinks in our working directory so that the pwd
+# Make sure we are testing the latest version.
-# in subprocesses equals our $PWD (for pathname comparisons).
-cd -P .
-
-# Record our location for reference.
 TEST_DIRECTORY=$(pwd)
+PATH=$TEST_DIRECTORY/..:$PATH
 
 # Test repository
 test="trash directory.$(basename "$0" .sh)"
@@ -436,149 +431,12 @@ test_init_todo () {
 	cd "$root" || error "Cannot setup todo dir in $root"
         # Initialize the configuration file. Carefully quoted.
         sed -e 's|TODO_DIR=.*$|TODO_DIR="'"$TEST_DIRECTORY/$test"'"|' $TEST_DIRECTORY/../todo.cfg > todo.cfg
-
-	# Install latest todo.sh
-	mkdir bin
-	ln -s "$TEST_DIRECTORY/../todo.sh" bin/todo.sh
-
-	# Initialize a hack date script
-	TODO_TEST_REAL_DATE=$(which date)
-	TODO_TEST_TIME=1234500000
-	export PATH TODO_TEST_REAL_DATE TODO_TEST_TIME
-
-	# Trying to detect the version of "date" on current system
-	DATE_STYLE=unknown
-	# on GNU systems (versions may vary):
-	#date --version
-	#date (GNU coreutils) 6.10
-	#...
-	if date --version 2>&1 | grep -q "GNU"; then
-		DATE_STYLE=GNU
-	# on Mac OS X 10.5:
-	#date --version
-	#date: illegal option -- -
-	#usage: date [-jnu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ...
-	#[-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format]
-	elif date --version 2>&1 | grep -q -e "-jnu"; then
-		DATE_STYLE=Mac10.5
-	# on Mac OS X 10.4:
-	#date --version
-	#date: illegal option -- -
-	#usage: date [-nu] [-r seconds] [+format]
-	#       date [[[[[cc]yy]mm]dd]hh]mm[.ss]
-	elif date --version 2>&1 | grep -q -e "-nu"; then
-		DATE_STYLE=Mac10.4
-	fi
-
-	case $DATE_STYLE in
-		GNU)
-			cat > bin/date <<-EOF
-			#!/bin/sh
-			exec "$TODO_TEST_REAL_DATE" -d @\$TODO_TEST_TIME \$@
-			EOF
-			chmod 755 bin/date
-		;;
-		Mac10.5)
-			cat > bin/date <<-EOF
-			#!/bin/sh
-			exec "$TODO_TEST_REAL_DATE" -j -f %s \$TODO_TEST_TIME \$@
-			EOF
-			chmod 755 bin/date
-		;;
-		Mac10.4)
-			cat > bin/date <<-EOF
-			#!/bin/sh
-			exec "$TODO_TEST_REAL_DATE" -r \$TODO_TEST_TIME \$@
-			EOF
-			chmod 755 bin/date
-		;;
-		*)
-			echo "WARNING: Current date executable not recognized"
-			echo "So today date will be used, expect false negative tests..."
-		;;
-	esac
-
-	# Ensure a correct PATH for testing.
-	PATH=$owd/$root/bin:$PATH
-	export PATH
-
 	cd "$owd"
 }
 
-# Usage: test_tick [increment]
-test_tick () {
-	TODO_TEST_TIME=$(($TODO_TEST_TIME + ${1:-86400}))
-}
-
-# Generate and run a series of tests based on a transcript.
-# Usage: test_todo_session "description" <<EOF
-# >>> command
-# output1
-# output2
-# >>> command
-# === exit status
-# output3
-# output4
-# EOF
-test_todo_session () {
-    test "$#" = 1 ||
-    error "bug in the test script: extra args to test_todo_session"
-    subnum=1
-    cmd=""
-    status=0
-    > expect
-    while read line
-    do
-	case $line in
-	">>> "*)
-	    test -z "$cmd" || error "bug in the test script: missing blank line separator in test_todo_session"
-	    cmd=${line#>>> }
-	    ;;
-	"=== "*)
-	    status=${line#=== }
-	    ;;
-	"")
-	    if [ ! -z "$cmd" ]; then
-		if [ $status = 0 ]; then
-		    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
-		else
-		    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
-		fi
-
-		subnum=$(($subnum + 1))
-		cmd=""
-		status=0
-		> expect
-	    fi
-	    ;;
-	*)
-	    echo $line >> expect
-	    ;;
-	esac
-    done
-    if [ ! -z "$cmd" ]; then
-	if [ $status = 0 ]; then
-	    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
-	else
-	    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
-	fi
-    fi
-}
-
-test_shell () {
-	trap - EXIT
-	export PS1='$(ret_val=$?; [ "$ret_val" != "0" ] && echo -e "=== $ret_val\n\n>>> "||echo "\n>>> ")'
-	cat <<EOF
-Do your tests session here and
-don't forget to replace the hardcoded path with \$HOME in the transcript:
-$HOME/todo.txt => \$HOME/todo.txt
-EOF
-	bash --noprofile --norc
-	exit 0
-}
 
 test_init_todo "$test"
-# Use -P to resolve symlinks in our working directory so that the pwd
+# Use -P to resolve symlinks in our working directory so that the cwd
 # in subprocesses equals our $PWD (for pathname comparisons).
 cd -P "$test" || exit 1
 

tests/testshell.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-test_description='Providing an interactive shell in the proper environment'
-. ./test-lib.sh
-
-test_shell

todo.cfg

@@ -52,15 +52,4 @@ export TMP_FILE="$TODO_DIR/todo.tmp"
 # === BEHAVIOR ===
 
 ## customize list output
-#
-# TODOTXT_SORT_COMMAND will filter after line numbers are
-# inserted, but before colorization, and before hiding of
-# priority, context, and project.
-#
 # export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -f -k2'
-
-# TODOTXT_FINAL_FILTER will filter list output after colorization,
-# priority hiding, context hiding, and project hiding. That is,
-# just before the list output is displayed.
-#
-# export TODOTXT_FINAL_FILTER='cat'

todo.sh

@@ -1,228 +1,210 @@
 #! /bin/bash
 
-# NOTE:  Todo.sh requires the .todo/config configuration file to run.
+# NOTE:  Todo.sh requires the todo.cfg configuration file to run.
-# Place the .todo/config file in your home directory or use the -d option for a custom location.
+# Place the todo.cfg file in your home directory or use the -d option for a custom location.
 
 [ -f VERSION-FILE ] && . VERSION-FILE || VERSION="@DEV_VERSION@"
-version() {
+version() { sed -e 's/^    //' <<EndVersion
-    cat <<-EndVersion
+        TODO.TXT Command Line Interface v$VERSION
-		TODO.TXT Command Line Interface v$VERSION
+        
-
+        First release: 5/11/2006
-		First release: 5/11/2006
+        Original conception by: Gina Trapani (http://ginatrapani.org)
-		Original conception by: Gina Trapani (http://ginatrapani.org)
+        Contributors: http://github.com/ginatrapani/todo.txt-cli/network
-		Contributors: http://github.com/ginatrapani/todo.txt-cli/network
+        License: GPL, http://www.gnu.org/copyleft/gpl.html
-		License: GPL, http://www.gnu.org/copyleft/gpl.html
+        More information and mailing list at http://todotxt.com
-		More information and mailing list at http://todotxt.com
+        Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
-		Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
+EndVersion
-	EndVersion
     exit 1
 }
 
-# Set script name and full path early.
+oneline_usage="todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
-TODO_SH=$(basename "$0")
-TODO_FULL_SH="$0"
-export TODO_SH TODO_FULL_SH
-
-oneline_usage="$TODO_SH [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
 
 usage()
 {
-    cat <<-EndUsage
+    sed -e 's/^    //' <<EndUsage
-		Usage: $oneline_usage
+    Usage: $oneline_usage
-		Try '$TODO_SH -h' for more information.
+    Try 'todo.sh -h' for more information.
-	EndUsage
+EndUsage
     exit 1
 }
 
 shorthelp()
 {
-    cat <<-EndHelp
+    sed -e 's/^    //' <<EndHelp
-		  Usage: $oneline_usage
+      Usage: $oneline_usage
 
-		  Actions:
+      Actions:
-		    add|a "THING I NEED TO DO +project @context"
+        add|a "THING I NEED TO DO +project @context"
-		    addto DEST "TEXT TO ADD"
+        addto DEST "TEXT TO ADD"
-		    addm "THINGS I NEED TO DO
+        append|app NUMBER "TEXT TO APPEND"
-		          MORE THINGS I NEED TO DO"
+        archive
-		    append|app NUMBER "TEXT TO APPEND"
+        command [ACTIONS]
-		    archive
+        del|rm NUMBER [TERM]
-		    command [ACTIONS]
+        dp|depri NUMBER
-		    del|rm NUMBER [TERM]
+        do NUMBER
-		    dp|depri NUMBER
+        help
-		    do NUMBER
+        list|ls [TERM...]
-		    help
+        listall|lsa [TERM...]
-		    list|ls [TERM...]
+        listcon|lsc
-		    listall|lsa [TERM...]
+        listfile|lf SRC [TERM...]
-		    listcon|lsc
+        listpri|lsp [PRIORITY]
-		    listfile|lf SRC [TERM...]
+        listproj|lsprj
-		    listpri|lsp [PRIORITY]
+        move|mv NUMBER DEST [SRC]
-		    listproj|lsprj
+        prepend|prep NUMBER "TEXT TO PREPEND"
-		    move|mv NUMBER DEST [SRC]
+        pri|p NUMBER PRIORITY
-		    prepend|prep NUMBER "TEXT TO PREPEND"
+        replace NUMBER "UPDATED TODO"
-		    pri|p NUMBER PRIORITY
+        report
-		    replace NUMBER "UPDATED TODO"
-		    report
 
-		  See "help" for more details.
+      See "help" for more details.
-	EndHelp
+EndHelp
     exit 0
 }
 
 help()
 {
-    cat <<-EndHelp
+    sed -e 's/^    //' <<EndHelp
-		  Usage: $oneline_usage
+      Usage: $oneline_usage
 
-		  Actions:
+      Actions:
-		    add "THING I NEED TO DO +project @context"
+        add "THING I NEED TO DO +project @context"
-		    a "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.
+          Adds THING I NEED TO DO to your todo.txt file on its own line.
-		      Project and context notation optional.
+          Project and context notation optional.
-		      Quotes optional.
+          Quotes optional.
 
-		    addm "FIRST THING I NEED TO DO +project1 @context
+        addto DEST "TEXT TO ADD"
-		    SECOND THING I NEED TO DO +project2 @context"
+          Adds a line of text to any file located in the todo.txt directory.
-		      Adds FIRST THING I NEED TO DO to your todo.txt on its own line and
+          For example, addto inbox.txt "decide about vacation"
-		      Adds SECOND THING I NEED TO DO to you todo.txt on its own line.
-		      Project and context notation optional.
-		      Quotes optional.
 
-		    addto DEST "TEXT TO ADD"
+        append NUMBER "TEXT TO APPEND"
-		      Adds a line of text to any file located in the todo.txt directory.
+        app NUMBER "TEXT TO APPEND"
-		      For example, addto inbox.txt "decide about vacation"
+          Adds TEXT TO APPEND to the end of the todo on line NUMBER.
+          Quotes optional.
 
-		    append NUMBER "TEXT TO APPEND"
+        archive
-		    app NUMBER "TEXT TO APPEND"
+          Moves done items from todo.txt to done.txt and removes blank lines.
-		      Adds TEXT TO APPEND to the end of the todo on line NUMBER.
-		      Quotes optional.
 
-		    archive
+        command [ACTIONS]
-		      Moves done items from todo.txt to done.txt and removes blank lines.
+          Runs the remaining arguments using only todo.sh builtins.
+          Will not call any .todo.actions.d scripts.
 
-		    command [ACTIONS]
+        del NUMBER [TERM]
-		      Runs the remaining arguments using only todo.sh builtins.
+        rm NUMBER [TERM]
-		      Will not call any .todo.actions.d scripts.
+          Deletes the item on line NUMBER in todo.txt.
+          If term specified, deletes only the term from the line.
 
-		    del NUMBER [TERM]
+        depri NUMBER
-		    rm NUMBER [TERM]
+        dp NUMBER
-		      Deletes the item on line NUMBER in todo.txt.
+          Deprioritizes (removes the priority) from the item
-		      If term specified, deletes only the term from the line.
+          on line NUMBER in todo.txt.
 
-		    depri NUMBER
+        do NUMBER
-		    dp NUMBER
+          Marks item on line NUMBER as done in todo.txt.
-		      Deprioritizes (removes the priority) from the item
-		      on line NUMBER in todo.txt.
 
-		    do NUMBER[, NUMBER, NUMBER, ...]
+        help
-		      Marks item(s) on line NUMBER as done in todo.txt.
+          Display this help message.
 
-		    help
+        list [TERM...]
-		      Display this help message.
+        ls [TERM...]
+          Displays all todo's that contain TERM(s) sorted by priority with line
+          numbers.  If no TERM specified, lists entire todo.txt.
 
-		    list [TERM...]
+        listall [TERM...]
-		    ls [TERM...]
+        lsa [TERM...]
-		      Displays all todo's that contain TERM(s) sorted by priority with line
+          Displays all the lines in todo.txt AND done.txt that contain TERM(s)
-		      numbers.  If no TERM specified, lists entire todo.txt.
+          sorted by priority with line  numbers.  If no TERM specified, lists
+          entire todo.txt AND done.txt concatenated and sorted.
 
-		    listall [TERM...]
+        listcon
-		    lsa [TERM...]
+        lsc
-		      Displays all the lines in todo.txt AND done.txt that contain TERM(s)
+          Lists all the task contexts that start with the @ sign in todo.txt.
-		      sorted by priority with line  numbers.  If no TERM specified, lists
-		      entire todo.txt AND done.txt concatenated and sorted.
 
-		    listcon
+        listfile SRC [TERM...]
-		    lsc
+        lf SRC [TERM...]
-		      Lists all the task contexts that start with the @ sign in todo.txt.
+          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.
 
-		    listfile SRC [TERM...]
+        listpri [PRIORITY]
-		    lf SRC [TERM...]
+        lsp [PRIORITY]
-		      Displays all the lines in SRC file located in the todo.txt directory,
+          Displays all items prioritized PRIORITY.
-		      sorted by priority with line  numbers.  If TERM specified, lists
+          If no PRIORITY specified, lists all prioritized items.
-		      all lines that contain TERM in SRC file.
 
-		    listpri [PRIORITY]
+        listproj
-		    lsp [PRIORITY]
+        lsprj
-		      Displays all items prioritized PRIORITY.
+          Lists all the projects that start with the + sign in todo.txt.
-		      If no PRIORITY specified, lists all prioritized items.
 
-		    listproj
+        move NUMBER DEST [SRC]
-		    lsprj
+        mv NUMBER DEST [SRC]
-		      Lists all the projects that start with the + sign in todo.txt.
+          Moves a line from source text file (SRC) to destination text file (DEST).
+          Both source and destination file must be located in the directory defined
+          in the configuration directory.  When SRC is not defined
+          it's by default todo.txt.
 
-		    move NUMBER DEST [SRC]
+        prepend NUMBER "TEXT TO PREPEND"
-		    mv NUMBER DEST [SRC]
+        prep NUMBER "TEXT TO PREPEND"
-		      Moves a line from source text file (SRC) to destination text file (DEST).
+          Adds TEXT TO PREPEND to the beginning of the todo on line NUMBER.
-		      Both source and destination file must be located in the directory defined
+          Quotes optional.
-		      in the configuration directory.  When SRC is not defined
-		      it's by default todo.txt.
 
-		    prepend NUMBER "TEXT TO PREPEND"
+        pri NUMBER PRIORITY
-		    prep NUMBER "TEXT TO PREPEND"
+        p NUMBER PRIORITY
-		      Adds TEXT TO PREPEND to the beginning of the todo on line NUMBER.
+          Adds PRIORITY to todo on line NUMBER.  If the item is already
-		      Quotes optional.
+          prioritized, replaces current priority with new PRIORITY.
+          PRIORITY must be an uppercase letter between A and Z.
 
-		    pri NUMBER PRIORITY
+        replace NUMBER "UPDATED TODO"
-		    p NUMBER PRIORITY
+          Replaces todo on line NUMBER with UPDATED TODO.
-		      Adds PRIORITY to todo on line NUMBER.  If the item is already
-		      prioritized, replaces current priority with new PRIORITY.
-		      PRIORITY must be an uppercase letter between A and Z.
 
-		    replace NUMBER "UPDATED TODO"
+        report
-		      Replaces todo on line NUMBER with UPDATED TODO.
+          Adds the number of open todo's and closed done's to report.txt.
-
-		    report
-		      Adds the number of open todo's and closed done's to report.txt.
 
 
 
-		  Options:
+      Options:
-		    -@
+        -@
-		        Hide context names in list output. Use twice to show context
+            Hide context names in list output. Use twice to show context
-		        names (default).
+            names (default).
-		    -+
+        -+
-		        Hide project names in list output. Use twice to show project
+            Hide project names in list output. Use twice to show project
-		        names (default).
+            names (default).
-		    -d CONFIG_FILE
+        -d CONFIG_FILE
-		        Use a configuration file other than the default ~/.todo/config
+            Use a configuration file other than the default ~/todo.cfg
-		    -f
+        -f
-		        Forces actions without confirmation or interactive input
+            Forces actions without confirmation or interactive input
-		    -h
+        -h
-		        Display a short help message
+            Display a short help message
-		    -p
+        -p
-		        Plain mode turns off colors
+            Plain mode turns off colors
-		    -P
+        -P
-		        Hide priority labels in list output. Use twice to show
+            Hide priority labels in list output. Use twice to show
-		        priority labels (default).
+            priority labels (default).
-		    -a
+        -a
-		        Don't auto-archive tasks automatically on completion
+            Don't auto-archive tasks automatically on completion
-		    -n
+        -n
-		        Don't preserve line numbers; automatically remove blank lines
+            Don't preserve line numbers; automatically remove blank lines
-		        on task deletion
+            on task deletion
-		    -t
+        -t
-		        Prepend the current date to a task automatically
+            Prepend the current date to a task automatically
-		        when it's added.
+            when it's added.
-		    -v
+        -v
-		        Verbose mode turns on confirmation messages
+            Verbose mode turns on confirmation messages
-		    -vv
+        -vv
-		        Extra verbose mode prints some debugging information
+            Extra verbose mode prints some debugging information
-		    -V
+        -V
-		        Displays version, license and credits
+            Displays version, license and credits
-		    -x
-		        Disables TODOTXT_FINAL_FILTER
 
 
-		  Environment variables:
+      Environment variables:
-		    TODOTXT_AUTO_ARCHIVE=0          is same as option -a
+        TODOTXT_AUTO_ARCHIVE=0          is same as option -a
-		    TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
+        TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
-		    TODOTXT_FORCE=1                 is same as option -f
+        TODOTXT_FORCE=1                 is same as option -f
-		    TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n
+        TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n
-		    TODOTXT_PLAIN=1                 is same as option -p
+        TODOTXT_PLAIN=1                 is same as option -p
-		    TODOTXT_DATE_ON_ADD=1           is same as option -t
+        TODOTXT_DATE_ON_ADD=1           is same as option -t
-		    TODOTXT_VERBOSE=1               is same as option -v
+        TODOTXT_VERBOSE=1               is same as option -v
-		    TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
+        TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
-		    TODOTXT_SORT_COMMAND="sort ..." customize list output
+        TODOTXT_SORT_COMMAND="sort ..." customize list output
-		    TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
+EndHelp
-	EndHelp
 
     if [ -d "$TODO_ACTIONS_DIR" ]
     then
@@ -253,21 +235,6 @@ cleanup()
     exit 0
 }
 
-cleaninput()
-{
-    # Cleanup the input
-    # Replace newlines with spaces Always
-    input=`echo $input | tr -d '\r|\n'`
-
-    action_regexp="^\(append\|app\|prepend\|prep\|replace\)$"
-
-    # Check which action we are being used in as this affects what cleaning we do
-    if [ `echo $action | grep -c $action_regexp` -eq 1 ]; then
-        # These actions use sed and & as the matched string so escape it
-        input=`echo $input | sed 's/\&/\\\&/g'`
-    fi
-}
-
 archive()
 {
     #defragment blank lines
@@ -276,7 +243,7 @@ archive()
     grep "^x " "$TODO_FILE" >> "$DONE_FILE"
     sed -i.bak '/^x /d' "$TODO_FILE"
     cp "$TODO_FILE" "$TMP_FILE"
-    sed -n 'G; s/\n/&&/; /^\([ ~-]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
+    sed -n 'G; s/\n/&&/; /^\([ -~]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
     #[[ $TODOTXT_VERBOSE -gt 0 ]] && echo "TODO: Duplicate tasks have been removed."
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $TODO_FILE archived."
     cleanup
@@ -284,14 +251,14 @@ archive()
 
 
 # == PROCESS OPTIONS ==
-while getopts ":fhpnatvVx+@Pd:" Option
+while getopts ":fhpnatvV+@Pd:" Option
 do
   case $Option in
     '@' )
         ## HIDE_CONTEXT_NAMES starts at zero (false); increment it to one
         ##   (true) the first time this flag is seen. Each time the flag
         ##   is seen after that, increment it again so that an even
-        ##   number shows context names and an odd number hides context
+        ##   number hides project names and an odd number shows project
         ##   names.
         : $(( HIDE_CONTEXT_NAMES++ ))
         if [ $(( $HIDE_CONTEXT_NAMES % 2 )) -eq 0 ]
@@ -307,7 +274,7 @@ do
         ## HIDE_PROJECT_NAMES starts at zero (false); increment it to one
         ##   (true) the first time this flag is seen. Each time the flag
         ##   is seen after that, increment it again so that an even
-        ##   number shows project names and an odd number hides project
+        ##   number hides project names and an odd number shows project
         ##   names.
         : $(( HIDE_PROJECT_NAMES++ ))
         if [ $(( $HIDE_PROJECT_NAMES % 2 )) -eq 0 ]
@@ -341,8 +308,8 @@ do
         ## HIDE_PRIORITY_LABELS starts at zero (false); increment it to one
         ##   (true) the first time this flag is seen. Each time the flag
         ##   is seen after that, increment it again so that an even
-        ##   number shows priority labels and an odd number hides priority
+        ##   number hides project names and an odd number shows project
-        ##   labels.
+        ##   names.
         : $(( HIDE_PRIORITY_LABELS++ ))
         if [ $(( $HIDE_PRIORITY_LABELS % 2 )) -eq 0 ]
         then
@@ -362,9 +329,6 @@ do
     V )
         version
         ;;
-    x )
-        TODOTXT_DISABLE_FILTER=1
-        ;;
   esac
 done
 shift $(($OPTIND - 1))
@@ -372,17 +336,15 @@ shift $(($OPTIND - 1))
 # defaults if not yet defined
 TODOTXT_VERBOSE=${TODOTXT_VERBOSE:-1}
 TODOTXT_PLAIN=${TODOTXT_PLAIN:-0}
-TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/.todo/config}
+TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/todo.cfg}
 TODOTXT_FORCE=${TODOTXT_FORCE:-0}
 TODOTXT_PRESERVE_LINE_NUMBERS=${TODOTXT_PRESERVE_LINE_NUMBERS:-1}
 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_FINAL_FILTER=${TODOTXT_FINAL_FILTER:-cat}
 
-# Export all TODOTXT_* variables
+export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD TODOTXT_SORT_COMMAND
-export ${!TODOTXT_@}
 
 # Default color map
 export NONE=''
@@ -410,15 +372,6 @@ export PRI_B=$GREEN         # color for B priority
 export PRI_C=$LIGHT_BLUE    # color for C priority
 export PRI_X=$WHITE         # color for rest of them
 
-[ -e "$TODOTXT_CFG_FILE" ] || {
-    CFG_FILE_ALT="$HOME/todo.cfg"
-
-    if [ -e "$CFG_FILE_ALT" ]
-    then
-        TODOTXT_CFG_FILE="$CFG_FILE_ALT"
-    fi
-}
-
 [ -e "$TODOTXT_CFG_FILE" ] || {
     CFG_FILE_ALT="$HOME/.todo.cfg"
 
@@ -430,18 +383,12 @@ export PRI_X=$WHITE         # color for rest of them
 
 if [ -z "$TODO_ACTIONS_DIR" -o ! -d "$TODO_ACTIONS_DIR" ]
 then
-    TODO_ACTIONS_DIR="$HOME/.todo/actions"
+    TODO_ACTIONS_DIR="$HOME/.todo.actions.d"
     export TODO_ACTIONS_DIR
 fi
 
-[ -d "$TODO_ACTIONS_DIR" ] || {
+TODO_SH="$0"
-    TODO_ACTIONS_DIR_ALT="$HOME/.todo.actions.d"
+export TODO_SH
-
-    if [ -d "$TODO_ACTIONS_DIR_ALT" ]
-    then
-        TODO_ACTIONS_DIR="$TODO_ACTIONS_DIR_ALT"
-    fi
-}
 
 # === SANITY CHECKS (thanks Karl!) ===
 [ -r "$TODOTXT_CFG_FILE" ] || die "Fatal error: Cannot read configuration file $TODOTXT_CFG_FILE"
@@ -470,24 +417,6 @@ fi
 # === HEAVY LIFTING ===
 shopt -s extglob
 
-_addto() {
-    file="$1"
-    input="$2"
-    cleaninput $input
-
-    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
-        now=`date '+%Y-%m-%d'`
-        input="$now $input"
-    fi
-    echo "$input" >> "$file"
-    [ $TODOTXT_VERBOSE -gt 0 ] && {
-        TASKNUM=$(sed -n '$ =' "$file")
-        BASE=$(basename "$file")
-        PREFIX=$(echo ${BASE%%.[^.]*} | tr [a-z] [A-Z])
-        echo "${PREFIX}: '$input' added on line $TASKNUM."
-    }
-}
-
 _list() {
     local FILE="$1"
     ## If the file starts with a "/" use absolute path. Otherwise,
@@ -546,13 +475,10 @@ _list() {
 
     ## Number the file, then run the filter command,
     ## then sort and mangle output some more
-    if [[ $TODOTXT_DISABLE_FILTER = 1 ]]; then
-        TODOTXT_FINAL_FILTER="cat"
-    fi
     items=$(
         sed = "$src"                                            \
         | sed "N; s/^/     /; s/ *\(.\{$PADDING,\}\)\n/\1 /"    \
-        | grep -v "^[ 0-9]\+ *$"
+        | grep -v "^[0-9]\+ *$"
     )
     if [ "${filter_command}" ]; then
         filtered_items=$(echo -ne "$items" | eval ${filter_command})
@@ -568,7 +494,7 @@ _list() {
             s/^  /00/;
             s/^ /0/;
           ''' \
-        | eval ${TODOTXT_SORT_COMMAND}                                        \
+        | ${TODOTXT_SORT_COMMAND}                                        \
         | sed '''
             /^[0-9]\{'$PADDING'\} x /! {
                 s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g;
@@ -582,18 +508,15 @@ _list() {
             s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
             s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
           '''                                                   \
-        | eval ${TODOTXT_FINAL_FILTER}                          \
     )
     echo -ne "$filtered_items${filtered_items:+\n}"
 
     if [ $TODOTXT_VERBOSE -gt 0 ]; then
-        BASE=$(basename "$FILE")
-        PREFIX=$(echo ${BASE%%.[^.]*} | tr [a-z] [A-Z])
         NUMTASKS=$( echo -ne "$filtered_items" | sed -n '$ =' )
         TOTALTASKS=$( echo -ne "$items" | sed -n '$ =' )
 
         echo "--"
-        echo "${PREFIX}: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown"
+        echo "TODO: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown from $FILE"
     fi
     if [ $TODOTXT_VERBOSE -gt 1 ]
     then
@@ -629,52 +552,39 @@ case $action in
         echo -n "Add: "
         read input
     else
-        [ -z "$2" ] && die "usage: $TODO_SH add \"TODO ITEM\""
+        [ -z "$2" ] && die "usage: $0 add \"TODO ITEM\""
-        shift
-        input=$*
-    fi
-    _addto "$TODO_FILE" "$input"
-    cleanup;;
-
-"addm")
-    if [[ -z "$2" && $TODOTXT_FORCE = 0 ]]; then
-        echo -n "Add: "
-        read input
-    else
-        [ -z "$2" ] && die "usage: $TODO_SH addm \"TODO ITEM\""
         shift
         input=$*
     fi
 
-    # Set Internal Field Seperator as newline so we can 
+    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
-    # loop across multiple lines
+        now=`date '+%Y-%m-%d'`
-    SAVEIFS=$IFS
+        input="$now $input"
-    IFS=$'\n'
+    fi
-
+    echo "$input" >> "$TODO_FILE"
-    # Treat each line seperately
+    TASKNUM=$(sed -n '$ =' "$TODO_FILE")
-    for line in $input ; do
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added on line $TASKNUM."
-        _addto "$TODO_FILE" "$line"
-    done
-    IFS=$SAVEIFS
     cleanup;;
 
 "addto" )
-    [ -z "$2" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
+    [ -z "$2" ] && die "usage: $0 addto DEST \"TODO ITEM\""
     dest="$TODO_DIR/$2"
-    [ -z "$3" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
+    [ -z "$3" ] && die "usage: $0 addto DEST \"TODO ITEM\""
     shift
     shift
     input=$*
 
     if [ -f "$dest" ]; then
-        _addto "$dest" "$input"
+        echo "$input" >> "$dest"
+        TASKNUM=$(sed -n '$ =' "$dest")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added to $dest on line $TASKNUM."
     else
         echo "TODO: Destination file $dest does not exist."
     fi
     cleanup;;
 
 "append" | "app" )
-    errmsg="usage: $TODO_SH append ITEM# \"TEXT TO APPEND\""
+    errmsg="usage: $0 append ITEM# \"TEXT TO APPEND\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -687,13 +597,9 @@ case $action in
     else
         input=$*
     fi
-    cleaninput $input
-
     if sed -i.bak $item" s|^.*|& $input|" "$TODO_FILE"; then
-        [ $TODOTXT_VERBOSE -gt 0 ] && {
+        newtodo=$(sed "$item!d" "$TODO_FILE")
-            newtodo=$(sed "$item!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
-            echo "$item: $newtodo"
-        }
     else
         echo "TODO: Error appending task $item."
     fi
@@ -704,7 +610,7 @@ case $action in
 
 "del" | "rm" )
     # replace deleted line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-    errmsg="usage: $TODO_SH del ITEM#"
+    errmsg="usage: $0 del ITEM#"
     item=$2
     [ -z "$item" ] && die "$errmsg"
 
@@ -743,7 +649,7 @@ case $action in
 
 "depri" | "dp" )
     item=$2
-    errmsg="usage: $TODO_SH depri ITEM#"
+    errmsg="usage: $0 depri ITEM#"
 
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item: No such todo."
@@ -754,45 +660,30 @@ case $action in
     if [ "$?" -eq 0 ]; then
         #it's all good, continue
         sed -i.bak -e $item"s/^(.) //" "$TODO_FILE"
-        [ $TODOTXT_VERBOSE -gt 0 ] && {
+        NEWTODO=$(sed "$item!d" "$TODO_FILE")
-            NEWTODO=$(sed "$item!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
-            echo "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item deprioritized."
-            echo "TODO: $item deprioritized."
-        }
         cleanup
     else
         die "$errmsg"
     fi;;
 
 "do" )
-    errmsg="usage: $TODO_SH do ITEM#"
+    errmsg="usage: $0 do ITEM#"
-    # shift so we get arguments to the do request
+    item=$2
-    shift;
+    [ -z "$item" ] && die "$errmsg"
+    [[ "$item" = +([0-9]) ]] || die "$errmsg"
 
-    # Split multiple do's, if comma seperated change to whitespace sepereated
+    todo=$(sed "$item!d" "$TODO_FILE")
-    # Loop the 'do' function for each item
+    [ -z "$todo" ] && die "$item: No such todo."
-    for item in `echo $* | tr ',' ' '`; do 
-        [ -z "$item" ] && die "$errmsg"
-        [[ "$item" = +([0-9]) ]] || die "$errmsg"
 
-        todo=$(sed "$item!d" "$TODO_FILE")
+    now=`date '+%Y-%m-%d'`
-        [ -z "$todo" ] && die "$item: No such todo."
+    # remove priority once item is done
-
+    sed -i.bak $item"s/^(.) //" "$TODO_FILE"
-        # Check if this item has already been done
+    sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
-        if [ `echo $todo | grep -c "^x "` -eq 0 ] ; then
+    newtodo=$(sed "$item!d" "$TODO_FILE")
-            now=`date '+%Y-%m-%d'`
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
-            # remove priority once item is done
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item marked as done."
-            sed -i.bak $item"s/^(.) //" "$TODO_FILE"
-            sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
-            [ $TODOTXT_VERBOSE -gt 0 ] && {
-                newtodo=$(sed "$item!d" "$TODO_FILE")
-                echo "$item: $newtodo"
-                echo "TODO: $item marked as done."
-            }
-        else
-            echo "$item is already marked done"
-        fi
-    done
 
     if [ $TODOTXT_AUTO_ARCHIVE = 1 ]; then
         archive
@@ -800,13 +691,7 @@ case $action in
     cleanup ;;
 
 "help" )
-    if [ -t 1 ] ; then # STDOUT is a TTY
+    help
-        if (exec which ${PAGER:-less} 2>/dev/null >/dev/null); then
-            # we have a working PAGER (or less as a default)
-            help | exec ${PAGER:-less}
-        fi
-    fi
-    help # just in case something failed above, we go ahead and just spew to STDOUT
     ;;
 
 "list" | "ls" )
@@ -836,11 +721,11 @@ case $action in
     ;;
 
 "listcon" | "lsc" )
-    grep -o '[^ ]*@[^ ]\+' "$TODO_FILE" | grep '^@' | sort -u
+    grep -w -o '@[^ ]\+' "$TODO_FILE" | sort -u
     cleanup ;;
 
 "listproj" | "lsprj" )
-    grep -o '[^ ]*+[^ ]\+' "$TODO_FILE" | grep '^+' | sort -u
+    grep -w -o '+[^ ]\+' "$TODO_FILE" | sort -u
     cleanup ;;
 
 
@@ -851,7 +736,7 @@ case $action in
     then
         ## A priority was specified
         pri=$( printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$' ) || {
-            die "usage: $TODO_SH listpri PRIORITY
+            die "usage: $0 listpri PRIORITY
             note: PRIORITY must a single letter from A to Z."
         }
     else
@@ -865,7 +750,7 @@ case $action in
 
 "move" | "mv" )
     # replace moved line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-    errmsg="usage: $TODO_SH mv ITEM# DEST [SRC]"
+    errmsg="usage: $0 mv ITEM# DEST [SRC]"
     item=$2
     dest="$TODO_DIR/$3"
     src="$TODO_DIR/$4"
@@ -913,7 +798,7 @@ case $action in
     cleanup;;
 
 "prepend" | "prep" )
-    errmsg="usage: $TODO_SH prepend ITEM# \"TEXT TO PREPEND\""
+    errmsg="usage: $0 prepend ITEM# \"TEXT TO PREPEND\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -928,33 +813,12 @@ case $action in
     else
         input=$*
     fi
-    cleaninput $input
 
-    # Test for then set priority
+    if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
-    if [ `sed "$item!d" "$TODO_FILE"|grep -c "^(\\w)"` -eq 1 ]; then
+        newtodo=$(sed "$item!d" "$TODO_FILE")
-        priority=$(sed "$item!d" "$TODO_FILE" | awk -F '\\(|\\)' '{print $2}')
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
-    fi
-
-    # If priority isn't set prepend
-    if [ -z $priority ]; then 
-    	if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
-            [ $TODOTXT_VERBOSE -gt 0 ] && {
-                newtodo=$(sed "$item!d" "$TODO_FILE")
-                echo "$item: $newtodo"
-            }
-    	else
-            echo "TODO: Error prepending task $item."
-        fi
-    # If priority is set, remove priority, prepend and add back priority
     else
-        if sed -i.bak -e "$item s/^(.) //" -e "$item s|^.*|\($priority\) $1 &|" "$TODO_FILE"; then
+        echo "TODO: Error prepending task $item."
-            [ $TODOTXT_VERBOSE -gt 0 ] && {
-                newtodo=$(sed "$item!d" "$TODO_FILE")
-                echo "$item: $newtodo"
-            }
-    	else
-            echo "TODO: Error prepending task $item."
-    	fi
     fi
     cleanup;;
 
@@ -962,7 +826,7 @@ case $action in
     item=$2
     newpri=$( printf "%s\n" "$3" | tr 'a-z' 'A-Z' )
 
-    errmsg="usage: $TODO_SH pri ITEM# PRIORITY
+    errmsg="usage: $0 pri ITEM# PRIORITY
 note: PRIORITY must be anywhere from A to Z."
 
     [ "$#" -ne 3 ] && die "$errmsg"
@@ -974,18 +838,16 @@ note: PRIORITY must be anywhere from A to Z."
     if [ "$?" -eq 0 ]; then
         #it's all good, continue
         sed -i.bak -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE"
-        [ $TODOTXT_VERBOSE -gt 0 ] && {
+        NEWTODO=$(sed "$item!d" "$TODO_FILE")
-            NEWTODO=$(sed "$item!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
-            echo "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item prioritized ($newpri)."
-            echo "TODO: $item prioritized ($newpri)."
-        }
         cleanup
     else
         die "$errmsg"
     fi;;
 
 "replace" )
-    errmsg="usage: $TODO_SH replace ITEM# \"UPDATED ITEM\""
+    errmsg="usage: $0 replace ITEM# \"UPDATED ITEM\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -994,31 +856,18 @@ note: PRIORITY must be anywhere from A to Z."
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item: No such todo."
 
-    # Test for then set priority
-    if [ `sed "$item!d" "$TODO_FILE"|grep -c "^(\\w)"` -eq 1 ]; then
-      priority=$(sed "$item!d" "$TODO_FILE" | awk -F '\\(|\\)' '{print $2}')
-    fi
-
     if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
         echo -n "Replacement: "
         read input
     else
         input=$*
     fi
-    cleaninput $input
 
-    # If priority isn't set replace, if it is remove priority, replace then add priority again
+    sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
-    if [ -z $priority ]; then
+    [ $TODOTXT_VERBOSE -gt 0 ] && NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
-      sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $todo"
-    else
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "replaced with"
-      sed -i.bak -e "$item s/^(.) //" -e "$item s|^.*|\($priority\) $input|" "$TODO_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $NEWTODO"
-    fi
-    [ $TODOTXT_VERBOSE -gt 0 ] && {
-        NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
-        echo "$item: $todo"
-        echo "replaced with"
-        echo "$item: $NEWTODO"
-    }
     cleanup;;
 
 "report" )