diff --git a/AUTHORS b/AUTHORS
index d045cad9b..027de8b31 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,4 +17,5 @@ With thanks to:
Stas Antons
Vincent Fleuranceau
T. Charles Yun
+ ArchiMark
diff --git a/ChangeLog b/ChangeLog
index c9f0cdaab..c2b641218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,15 @@
------ old releases ------------------------------
+1.4.3 (10/9/2008)
+ + Fixed misleading task count at bottom on "info" report.
+ + Added support for a shadow file that contains a plain text task report,
+ with the "shadow.file" and "shadow.command" configuration variables.
+ The shadow file is automatically updated whenever the task database
+ changes. Useful for integrating with "Samurize".
+
+------ old releases ------------------------------
+
1.4.2 (9/18/2008)
+ "task undo" can now retract a "task done" command, provided no reports
have been run (and therefore TDB::gc run)
diff --git a/TUTORIAL b/TUTORIAL
new file mode 100644
index 000000000..e389b623a
--- /dev/null
+++ b/TUTORIAL
@@ -0,0 +1,6 @@
+
+This TUTORIAL file has been deprecated. It is superseded by a richer and more
+extensive online version that can be found at:
+
+ http://www.beckingham.net/task.html
+
diff --git a/html/30second.html b/html/30second.html
index f1450c650..227b0bbf2 100644
--- a/html/30second.html
+++ b/html/30second.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ 30-Second Tutorial
diff --git a/html/advanced.html b/html/advanced.html
index 07f293754..30fc4a436 100644
--- a/html/advanced.html
+++ b/html/advanced.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Advanced Usage
diff --git a/html/color.html b/html/color.html
index 72c70772b..f88357e0c 100644
--- a/html/color.html
+++ b/html/color.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Color Usage
diff --git a/html/config.html b/html/config.html
index 37cd127b8..144df2498 100644
--- a/html/config.html
+++ b/html/config.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Task Configuration
@@ -279,6 +279,42 @@ ID Project Pri Description
preceding "task" program name.
+
+ shadow.file
+
+
+ If specified, designates a file path that will be autoamtically
+ written to by task, whenever the task database changes. In other
+ words, it is automatically kept up to date.
+
+
+
+ The shadow.command configuration variable is used to determine
+ which report is written to the shadow file. There is no color
+ used in the shadow file.
+
+
+
+ This feature can be useful in maintaining a current file for
+ use by the "Samurize" program.
+
+
+
+ shadow.command
+
+
+ This is the command that is run to maintain the shadow file,
+ determined by the shadow.file configuration variable. The
+ format is identical to that of default.command - please see
+ the documentation for default.command.
+
+
+
+ If this command is not specified, task will use the default.command
+ value instead. If that is not specified, the command "list" is used.
+
+
+
diff --git a/html/date.html b/html/date.html
index 0d4c8b711..f5dcee84a 100644
--- a/html/date.html
+++ b/html/date.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Date Handling
diff --git a/html/filter.html b/html/filter.html
new file mode 100644
index 000000000..0903cc247
--- /dev/null
+++ b/html/filter.html
@@ -0,0 +1,93 @@
+
+
+
+ Task Filters
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Task Filters
+
+
+
+
+
+
+
+ Copyright 2006-2008, P. Beckingham. All rights reserved.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/html/recur.html b/html/recur.html
index ca7e9d626..2a72f76b6 100644
--- a/html/recur.html
+++ b/html/recur.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Recurring Tasks
diff --git a/html/setup.html b/html/setup.html
index 209260e28..68ecbf8b6 100644
--- a/html/setup.html
+++ b/html/setup.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Task Setup
diff --git a/html/shadow.html b/html/shadow.html
new file mode 100644
index 000000000..d0d6161af
--- /dev/null
+++ b/html/shadow.html
@@ -0,0 +1,93 @@
+
+
+
+ Task Shadow Files
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Task Shadow Files
+
+
+
+
+
+
+
+ Copyright 2006-2008, P. Beckingham. All rights reserved.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/html/shell.html b/html/shell.html
index 147ea2aa4..6bade3cc6 100644
--- a/html/shell.html
+++ b/html/shell.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Interacting with the Shell
diff --git a/html/simple.html b/html/simple.html
index cfa72564f..85ca5782b 100644
--- a/html/simple.html
+++ b/html/simple.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Simple Usage
diff --git a/html/task.html b/html/task.html
index aeafd3ecf..52bbf05a8 100644
--- a/html/task.html
+++ b/html/task.html
@@ -1,7 +1,7 @@
- Task 1.5.0
+ Latest Release
@@ -54,8 +54,8 @@
Date Handling
Troubleshooting
Old Versions
-
- Filters (coming soon)
+ Filters (coming soon)
+ Shadow Files (coming soon)
diff --git a/html/usage.html b/html/usage.html
index 97b98f5df..92b7b1d88 100644
--- a/html/usage.html
+++ b/html/usage.html
@@ -1,7 +1,7 @@
- Task 1.4.1
+ Task Usage
diff --git a/html/versions.html b/html/versions.html
index 190a7251a..409c74fa4 100644
--- a/html/versions.html
+++ b/html/versions.html
@@ -38,6 +38,12 @@
New in version 1.4.2 (9/18/2008)
task-1.4.2.tar.gz
+
+ Mac OS X 10.5 (Leopard) Intel-only:
+ task-1.4.2.pkg
+
+ Debian package: task_1.4.2-1_i386.deb
+ (Thanks to Richard Querin )
diff --git a/src/TDB.cpp b/src/TDB.cpp
index dcced05af..9a67015b0 100644
--- a/src/TDB.cpp
+++ b/src/TDB.cpp
@@ -204,7 +204,9 @@ bool TDB::deleteT (const T& t)
sprintf (endTime, "%u", (unsigned int) time (NULL));
it->setAttribute ("end", endTime);
- return overwritePending (all);
+ bool status = overwritePending (all);
+ dbChanged ();
+ return status;
}
return false;
@@ -228,14 +230,16 @@ bool TDB::completeT (const T& t)
sprintf (endTime, "%u", (unsigned int) time (NULL));
it->setAttribute ("end", endTime);
- return overwritePending (all);
+ bool status = overwritePending (all);
+ dbChanged ();
+ return status;
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
-bool TDB::addT (const T& t) const
+bool TDB::addT (const T& t)
{
T task (t);
std::vector tags;
@@ -254,9 +258,15 @@ bool TDB::addT (const T& t) const
if (task.getStatus () == T::pending ||
task.getStatus () == T::recurring)
- return writePending (task);
+ {
+ bool status = writePending (task);
+ dbChanged ();
+ return status;
+ }
- return writeCompleted (task);
+ bool status = writeCompleted (task);
+ dbChanged ();
+ return status;
}
////////////////////////////////////////////////////////////////////////////////
@@ -281,7 +291,9 @@ bool TDB::modifyT (const T& t)
pending.push_back (*it);
}
- return overwritePending (pending);
+ bool status = overwritePending (pending);
+ dbChanged ();
+ return status;
}
////////////////////////////////////////////////////////////////////////////////
@@ -439,4 +451,20 @@ int TDB::nextId ()
}
////////////////////////////////////////////////////////////////////////////////
+void TDB::onChange (void (*callback)())
+{
+ if (callback)
+ mOnChange.push_back (callback);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Iterate over callbacks.
+void TDB::dbChanged ()
+{
+ foreach (i, mOnChange)
+ if (*i)
+ (**i) ();
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/TDB.h b/src/TDB.h
index 9ceb9b3d8..266800580 100644
--- a/src/TDB.h
+++ b/src/TDB.h
@@ -45,23 +45,27 @@ public:
bool allCompletedT (std::vector &) const;
bool deleteT (const T&);
bool completeT (const T&);
- bool addT (const T&) const;
+ bool addT (const T&);
bool modifyT (const T&);
bool logRead (std::vector &) const;
int gc ();
int nextId ();
+ void onChange (void (*)());
+
private:
bool lock (FILE*) const;
bool overwritePending (std::vector &);
bool writePending (const T&) const;
bool writeCompleted (const T&) const;
bool readLockedFile (const std::string&, std::vector &) const;
+ void dbChanged ();
private:
std::string mPendingFile;
std::string mCompletedFile;
int mId;
+ std::vector mOnChange;
};
#endif
diff --git a/src/command.cpp b/src/command.cpp
index c0d288598..6d0b70508 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -47,7 +47,7 @@
#endif
////////////////////////////////////////////////////////////////////////////////
-void handleAdd (const TDB& tdb, T& task, Config& conf)
+void handleAdd (TDB& tdb, T& task, Config& conf)
{
char entryTime[16];
sprintf (entryTime, "%u", (unsigned int) time (NULL));
diff --git a/src/report.cpp b/src/report.cpp
index 5c1d8ac8f..2e60e498e 100644
--- a/src/report.cpp
+++ b/src/report.cpp
@@ -659,9 +659,6 @@ void handleInfo (TDB& tdb, T& task, Config& conf)
if (table.rowCount ())
std::cout << optionalBlankLine (conf)
<< table.render ()
- << optionalBlankLine (conf)
- << table.rowCount ()
- << (table.rowCount () == 1 ? " task" : " tasks")
<< std::endl;
else
std::cout << "No matches." << std::endl;
diff --git a/src/task.cpp b/src/task.cpp
index e53f9675f..884cc0304 100644
--- a/src/task.cpp
+++ b/src/task.cpp
@@ -46,6 +46,11 @@
#include
#endif
+////////////////////////////////////////////////////////////////////////////////
+// Globals for exclusive use by callback function.
+static TDB* gTdb = NULL;
+static Config* gConf = NULL;
+
////////////////////////////////////////////////////////////////////////////////
static void shortUsage (Config& conf)
{
@@ -280,6 +285,7 @@ int main (int argc, char** argv)
// Load the config file from the home directory. If the file cannot be
// found, offer to create a sample one.
Config conf;
+ gConf = &conf;
loadConfFile (argc, argv, conf);
// When redirecting output to a file, do not use color, curses.
@@ -290,58 +296,13 @@ int main (int argc, char** argv)
}
TDB tdb;
+ gTdb = &tdb;
tdb.dataDirectory (expandPath (conf.get ("data.location")));
- // If argc == 1 and the default.command configuration variable is set,
- // then use that, otherwise stick with argc/argv.
- std::vector args;
- std::string defaultCommand = conf.get ("default.command");
- if (argc == 1 && defaultCommand != "")
- {
- // Stuff the command line.
- split (args, defaultCommand, ' ');
- std::cout << "[task " << defaultCommand << "]" << std::endl;
- }
- else
- {
- // Parse the command line.
- for (int i = 1; i < argc; ++i)
- args.push_back (argv[i]);
- }
+ // Set up TDB callback.
+ tdb.onChange (&onChangeCallback);
- std::string command;
- T task;
- parse (args, command, task, conf);
-
- if (command == "add") handleAdd (tdb, task, conf);
- else if (command == "projects") handleProjects (tdb, task, conf);
- else if (command == "tags") handleTags (tdb, task, conf);
- else if (command == "list") handleList (tdb, task, conf);
- else if (command == "info") handleInfo (tdb, task, conf);
- else if (command == "undelete") handleUndelete (tdb, task, conf);
- else if (command == "long") handleLongList (tdb, task, conf);
- else if (command == "ls") handleSmallList (tdb, task, conf);
- else if (command == "colors") handleColor ( conf);
- else if (command == "completed") handleCompleted (tdb, task, conf);
- else if (command == "delete") handleDelete (tdb, task, conf);
- else if (command == "start") handleStart (tdb, task, conf);
- else if (command == "done") handleDone (tdb, task, conf);
- else if (command == "undo") handleUndo (tdb, task, conf);
- else if (command == "export") handleExport (tdb, task, conf);
- else if (command == "version") handleVersion ( conf);
- else if (command == "summary") handleReportSummary (tdb, task, conf);
- else if (command == "next") handleReportNext (tdb, task, conf);
- else if (command == "history") handleReportHistory (tdb, task, conf);
- else if (command == "ghistory") handleReportGHistory (tdb, task, conf);
- else if (command == "calendar") handleReportCalendar (tdb, task, conf);
- else if (command == "active") handleReportActive (tdb, task, conf);
- else if (command == "overdue") handleReportOverdue (tdb, task, conf);
- else if (command == "oldest") handleReportOldest (tdb, task, conf);
- else if (command == "newest") handleReportNewest (tdb, task, conf);
- else if (command == "stats") handleReportStats (tdb, task, conf);
- else if (command == "" && task.getId ()) handleModify (tdb, task, conf);
- else if (command == "help") longUsage (conf);
- else shortUsage (conf);
+ runTaskCommand (argc, argv, tdb, conf);
}
catch (std::string& error)
@@ -391,12 +352,18 @@ int getDueState (const std::string& due)
if (due.length ())
{
Date dt (::atoi (due.c_str ()));
- Date now;
- if (dt < now)
+ // rightNow is the current date + time.
+ Date rightNow;
+
+ // By performing this conversion, today is set up as the same date, but
+ // midnight.
+ Date today (rightNow.month (), rightNow.day (), rightNow.year ());
+
+ if (dt < today)
return 2;
- Date nextweek = now + 7 * 86400;
+ Date nextweek = today + 7 * 86400;
if (dt < nextweek)
return 1;
}
@@ -544,7 +511,6 @@ Date getNextRecurrence (Date& current, std::string& period)
while (! Date::valid (m, d, y))
--d;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -563,7 +529,6 @@ Date getNextRecurrence (Date& current, std::string& period)
while (! Date::valid (m, d, y))
--d;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -579,7 +544,6 @@ Date getNextRecurrence (Date& current, std::string& period)
while (! Date::valid (m, d, y))
--d;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -598,7 +562,6 @@ Date getNextRecurrence (Date& current, std::string& period)
while (! Date::valid (m, d, y))
--d;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -614,7 +577,6 @@ Date getNextRecurrence (Date& current, std::string& period)
while (! Date::valid (m, d, y))
--d;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -630,7 +592,6 @@ Date getNextRecurrence (Date& current, std::string& period)
while (! Date::valid (m, d, y))
--d;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -639,7 +600,6 @@ Date getNextRecurrence (Date& current, std::string& period)
{
y += 2;
-// std::cout << "# next " << current.toString () << " + " << period << " = " << m << "/" << d << "/" << y << std::endl;
return Date (m, d, y);
}
@@ -657,7 +617,6 @@ void updateRecurrenceMask (
T& task)
{
std::string parent = task.getAttribute ("parent");
-// std::cout << "# updateRecurrenceMask of " << parent << std::endl;
if (parent != "")
{
std::vector ::iterator it;
@@ -665,11 +624,8 @@ void updateRecurrenceMask (
{
if (it->getUUID () == parent)
{
-// std::cout << "# located parent task" << std::endl;
unsigned int index = atoi (task.getAttribute ("imask").c_str ());
-// std::cout << "# child imask=" << index << std::endl;
std::string mask = it->getAttribute ("mask");
-// std::cout << "# parent mask=" << mask << std::endl;
if (mask.length () > index)
{
mask[index] = (task.getStatus () == T::pending) ? '-'
@@ -677,15 +633,11 @@ void updateRecurrenceMask (
: (task.getStatus () == T::deleted) ? 'X'
: '?';
-// std::cout << "# setting parent mask to=" << mask << std::endl;
it->setAttribute ("mask", mask);
-// std::cout << "# tdb.modifyT (parent)" << std::endl;
tdb.modifyT (*it);
}
else
{
-// std::cout << "# mask of insufficient length" << std::endl;
-// std::cout << "# should never occur" << std::endl;
std::string mask;
for (unsigned int i = 0; i < index; ++i)
mask += "?";
@@ -703,3 +655,117 @@ void updateRecurrenceMask (
}
////////////////////////////////////////////////////////////////////////////////
+// Using gTdb and gConf, generate a report.
+void onChangeCallback ()
+{
+ try
+ {
+ if (gConf && gTdb)
+ {
+ gConf->set ("curses", "off");
+ gConf->set ("color", "off");
+
+ // Determine if shadow file is enabled.
+ std::string shadowFile = expandPath (gConf->get ("shadow.file"));
+ if (shadowFile != "")
+ {
+ // Capture std::cout for the shadow file.
+ std::ofstream shadow (shadowFile.c_str ());
+ std::streambuf* original = std::cout.rdbuf (shadow.rdbuf ());
+
+ // Run report. Use shadow.command, using default.command as a fallback
+ // with "list" as a default.
+ std::string command = gConf->get ("shadow.command",
+ gConf->get ("default.command", "list"));
+ std::vector args;
+ split (args, command, ' ');
+ runTaskCommand (args, *gTdb, *gConf);
+
+ // Restore std::cout.
+ std::cout.rdbuf (original);
+ }
+ else
+ throw std::string ("Could not write to '") + shadowFile + "'.";
+ }
+ else
+ throw std::string ("Internal error (TDB/Config).");
+ }
+
+ catch (std::string& error)
+ {
+ std::cout << error << std::endl;
+ }
+
+ catch (...)
+ {
+ std::cout << "Unknown error." << std::endl;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void runTaskCommand (
+ int argc,
+ char** argv,
+ TDB& tdb,
+ Config& conf)
+{
+ std::vector args;
+ for (int i = 1; i < argc; ++i)
+ args.push_back (argv[i]);
+
+ runTaskCommand (args, tdb, conf);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void runTaskCommand (
+ std::vector & args,
+ TDB& tdb,
+ Config& conf)
+{
+ // If argc == 1 and the default.command configuration variable is set,
+ // then use that, otherwise stick with argc/argv.
+ std::string defaultCommand = conf.get ("default.command");
+ if (args.size () == 0 && defaultCommand != "")
+ {
+ // Stuff the command line.
+ args.clear ();
+ split (args, defaultCommand, ' ');
+ std::cout << "[task " << defaultCommand << "]" << std::endl;
+ }
+
+ std::string command;
+ T task;
+ parse (args, command, task, conf);
+
+ if (command == "add") handleAdd (tdb, task, conf);
+ else if (command == "projects") handleProjects (tdb, task, conf);
+ else if (command == "tags") handleTags (tdb, task, conf);
+ else if (command == "list") handleList (tdb, task, conf);
+ else if (command == "info") handleInfo (tdb, task, conf);
+ else if (command == "undelete") handleUndelete (tdb, task, conf);
+ else if (command == "long") handleLongList (tdb, task, conf);
+ else if (command == "ls") handleSmallList (tdb, task, conf);
+ else if (command == "colors") handleColor ( conf);
+ else if (command == "completed") handleCompleted (tdb, task, conf);
+ else if (command == "delete") handleDelete (tdb, task, conf);
+ else if (command == "start") handleStart (tdb, task, conf);
+ else if (command == "done") handleDone (tdb, task, conf);
+ else if (command == "undo") handleUndo (tdb, task, conf);
+ else if (command == "export") handleExport (tdb, task, conf);
+ else if (command == "version") handleVersion ( conf);
+ else if (command == "summary") handleReportSummary (tdb, task, conf);
+ else if (command == "next") handleReportNext (tdb, task, conf);
+ else if (command == "history") handleReportHistory (tdb, task, conf);
+ else if (command == "ghistory") handleReportGHistory (tdb, task, conf);
+ else if (command == "calendar") handleReportCalendar (tdb, task, conf);
+ else if (command == "active") handleReportActive (tdb, task, conf);
+ else if (command == "overdue") handleReportOverdue (tdb, task, conf);
+ else if (command == "oldest") handleReportOldest (tdb, task, conf);
+ else if (command == "newest") handleReportNewest (tdb, task, conf);
+ else if (command == "stats") handleReportStats (tdb, task, conf);
+ else if (command == "" && task.getId ()) handleModify (tdb, task, conf);
+ else if (command == "help") longUsage (conf);
+ else shortUsage (conf);
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/task.h b/src/task.h
index 9c417435b..bc15fbfc3 100644
--- a/src/task.h
+++ b/src/task.h
@@ -66,9 +66,12 @@ void handleRecurrence (TDB&, std::vector &);
bool generateDueDates (T&, std::vector &);
Date getNextRecurrence (Date&, std::string&);
void updateRecurrenceMask (TDB&, std::vector &, T&);
+void onChangeCallback ();
+void runTaskCommand (int, char**, TDB&, Config&);
+void runTaskCommand (std::vector &, TDB&, Config&);
// command.cpp
-void handleAdd (const TDB&, T&, Config&);
+void handleAdd (TDB&, T&, Config&);
void handleProjects (TDB&, T&, Config&);
void handleTags (TDB&, T&, Config&);
void handleUndelete (TDB&, T&, Config&);