diff --git a/.gitignore b/.gitignore index 36f7d8f5a..c61760acc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ config.h.in config.status src/.deps src/Makefile -src/task +*/task stamp-h1 Makefile configure diff --git a/ChangeLog b/ChangeLog index 0fb0f2823..61c2fde84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,8 @@ -Version numbers are of the form: - - X.Y.Z - -where the X represents a major version number, or architecture. The Y -represents a feature release, and the Z represents a patch. ------ current release --------------------------- -1.4.3 (10/24/2008) - + Fixed misleading task count at bottom on "info" report +1.4.3 (11/1/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 @@ -16,6 +10,9 @@ represents a feature release, and the Z represents a patch. + Task now displays a message whenever a shadow file is updated, if the "shadow.notify" configuration variable is set "on" + Bug: adding a task with a \n, \r or \f in it now fails properly + + Removed "task usage" command. + + Added documentation for Shadow files. + + Added documentation for task filters. ------ old releases ------------------------------ diff --git a/Makefile.am b/Makefile.am index 685ed0a57..fb05a3a4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = src -EXTRA_DIST = TUTORIAL DEVELOPERS +EXTRA_DIST = DEVELOPERS diff --git a/announcement.txt b/announcement.txt deleted file mode 100644 index 037106408..000000000 --- a/announcement.txt +++ /dev/null @@ -1,36 +0,0 @@ -Some considerable time ago - longer than I had hoped - I demonstrated an -alternate implementation of the todo script, called task, in the form of a -YouTube movie: - - http://www.youtube.com/watch?v=l68LCl6BYvs - -A lot has happened since then, and the task program has been slowly improving -thanks to feedback from some early testers, and continuous use by me. Today, -I have uploaded a new movie: - - http://www.youtube.com/watch?v=D2Kn4DMOVSw - -This movie includes most of the changes and improvements to task, but behind -the scenes are the biggest changes. There was a rewrite of the underlying -storage mechanism yielding a clean API for the front end, and the code was -reviewed for portability and converted to use GNU autoconf/automake. - -Task has been released under GPL, and so far has been tested on: - - Max OS X 10.4 (Tiger) - Max OS X 10.5 (Leopard) - Fedora 8 - Fedora 9 - Ubuntu 8 (Hardy Heron) - Solaris 10 - -Task has been making me more organized and productive for some time now. -Perhaps some of you might find it useful, and I welcome feedback of all kinds. - -You can find the task source code at: - - http://www.beckingham.net/task-1.0.0.tar.gz - -Thank you. -Paul Beckingham - diff --git a/binary/COPYING.txt b/binary/COPYING.txt new file mode 100644 index 000000000..627d3eb39 --- /dev/null +++ b/binary/COPYING.txt @@ -0,0 +1,281 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + diff --git a/binary/README.txt b/binary/README.txt new file mode 100644 index 000000000..01b01accd --- /dev/null +++ b/binary/README.txt @@ -0,0 +1,51 @@ +Thank you for taking a look at task. Task is a GTD utility featuring: + + - Robust C++ implementation + - Tags + - Colorful, tabular output + - Reports, graphs + - Lots of commands + - Low-level API + - Abbreviations for all commands, options + - Multi-user file locking + - Clean architecture allowing quick addition of new features + - Recurring tasks + +It is intended that features, mainly in the form of reports will be added +frequently, with best practices and useful reports evolving from usage patterns. + +Task is scope-limited to GTD functionality only. + +You may want to watch the old task movie on YouTube: + + http://www.youtube.com/watch?v=l68LCl6BYvs + +or the new improved one: + + http://www.youtube.com/watch?v=D2Kn4DMOVSw + +Either will give you a fairly good idea of what task is capable of, and +whether it fits in to your way of working. As a command line application, +task is not for everyone and some of you may prefer to not proceed. The +movie or online tutorial file are the quickest way for you to make that +decision. The online tutorial can be found at: + + http://www.beckingham.net/task.html + +Task is based on ideas presented in the todo.sh script, found on: + + http://todotxt.org + +Task has many more features than todo.sh, but fundamentally, they are +both working toward the same goals, which is to help you follow basic +Getting Things Done (GTD) principles. + +All feedback is welcome, in addition to any bug reports or patches to: + + task@beckingham.net + +Got an idea for an enhancement? Send a message! + +I have found that task makes me more productive and organized. +I hope task can do the same for you. + diff --git a/html/30second.html b/html/30second.html index 227b0bbf2..6cde1c6c2 100644 --- a/html/30second.html +++ b/html/30second.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
diff --git a/html/README b/html/README deleted file mode 100644 index ecd393fc9..000000000 --- a/html/README +++ /dev/null @@ -1,14 +0,0 @@ -Documentation Restructuring - high level pages - download - previous verisons - tutorial - recurrence - priorities - subprojects - tags - - - need page banner - need task link off beckinghma.net - diff --git a/html/advanced.html b/html/advanced.html index 97a344cdb..03a87d057 100644 --- a/html/advanced.html +++ b/html/advanced.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
@@ -313,24 +314,6 @@ ID Project Pri Description This command displays all the colors that task supports.

- % task usage -

- If logging has been enabled by the "command.logging=on" directive - in the .taskrc file, then task will record every command that is - run. When this command is run, task will display a count of how - many times each command was used. - -

- -

- This command is for the purpose of seeing whether command are - actually used. -

- -

- This command is deprecated, and will be removed in task 1.5.0 -

- % task version

This can be used to show the version number of task, and to display diff --git a/html/color.html b/html/color.html index f88357e0c..2d939a2e6 100644 --- a/html/color.html +++ b/html/color.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web

diff --git a/html/config.html b/html/config.html index eb4ba1c9b..bbdb16b73 100644 --- a/html/config.html +++ b/html/config.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
@@ -51,13 +52,6 @@ /Users/paul/.task -
command.logging
-
- May be "on" or "off", defaulting to "off". This determines - whether task records commands. This is not generally useful, - except while developing task. -
-
confirmation
May be "yes" or "no", and determines whether task will ask for diff --git a/html/date.html b/html/date.html index f5dcee84a..9c02cd399 100644 --- a/html/date.html +++ b/html/date.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
diff --git a/html/filter.html b/html/filter.html index af801375b..4f353bc44 100644 --- a/html/filter.html +++ b/html/filter.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
@@ -34,6 +35,46 @@

Task Filters

+ A task filter is a means of reducing a task report to a + subset that may consist of all tasks that have a specific + project, priority, tag, or part of the description. +

+ +

+ A task filter consists of additional command line options, + that are specified in the same way as when a task is added. +

+ +

+ All task reports can make use of filters. +

+ +

+ For example, the report: +

+ + 
% task list
 + +

+ Lists all tasks. +

+ + 
% task list the
 + +

+ Lists only tasks with "the" in the task description. +

+ + 
% task list project:Home priority:H
 + +

+ Lists only tasks with both the "Home" project and "H" priority. +

+ + 
% task list +shopping
 + +

+ Lists only tasks with the "shopping" tag.

diff --git a/html/links.html b/html/links.html new file mode 100644 index 000000000..c2739c586 --- /dev/null +++ b/html/links.html @@ -0,0 +1,188 @@ + + + + Task on the Web + + + + + +
+ + + + + + +
+ + +
+
+
+
+

Task on the Web

+

+ Task links from around the web... +

+ +
+ November 2008, Task repository on GitHub +
+
+ For developers: the task git repository on github.com is now public. +
+
+ +
+ October 2008, Using Task and Dropbox to manage your To-Do list +
+
+ by Richard Querin. Richard discusses the ease of setting up task to + use DropBox to share todo lists between work and home. +
+
+ +
+ September 2008, Task visualization +
+
+ by Stas Antons. Stas - a colleague of mine - presents a visualization + of the simplicity of task. +
+
+ +
+ June 2008, Building Debian Packages For Task +
+
+ by Richard Querin. Richard has been providing Debian packages for the + various task releases, and discusses how he got up to speed. +
+
+ +
+ June 2008, Task 1.0.1 - an attempt at a Cygwin Build How-To +
+
+ by Richard Querin. Richard shows us how to build task using Cygwin, after + a cry for help on the todo.txt mailing list. +
+
+ +
+ June 2008, The second task movie +
+
+ This YouTube movie was made to illustrate some of the features of the task + program, back when task 1.0.0 was released. While task has grown + significantly since then, the commands shown are still valid. It will + soon be time for a new movie! +

+ + This movie has a voice-over that explains what is going on. +

+ + For a higher-quality version, download the whole + movie file (10MB). +

+
+ +
+ December 2006, The first task movie +
+
+ This original YouTube task movie was made to illustrate the features of the + then-unreleased task program. The idea was to get some feedback and see + whether anyone was interested in a new implementation of todo.sh, that added + features that are not easily possible with a shell implementation. +

+ + This movie has no voice-over, and you may notice that it exactly duplicates + the commands used in the original todo.sh movie (below). That is, until it + deviates because of new task commands. +

+
+ +
+ June 2006, The original todo.sh movie +
+
+ by Gina Trapani. This is the original YouTube todo.sh movie, made to + illustrate the power and simplicity of the original todo.sh program. +
+
+ +
+ June 2006, Todo.sh, the inspiration for task +
+
+ by Gina Trapani. The website that introduced me to the power and + simplicity of the original todo.sh program. Contains useful links + and resources - take a look! +
+ +
+
+
+

+ Copyright 2006-2008, P. Beckingham. All rights reserved. +

+
+ +
+ 		+
+
+
+
+
+
+
+
+
+
+ + + +
+ +
+ + + + + + + diff --git a/html/recur.html b/html/recur.html index 2a72f76b6..978c94cef 100644 --- a/html/recur.html +++ b/html/recur.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
diff --git a/html/setup.html b/html/setup.html index 68ecbf8b6..7030b3cbc 100644 --- a/html/setup.html +++ b/html/setup.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
diff --git a/html/shadow.html b/html/shadow.html index c1d0f5926..0fe592d36 100644 --- a/html/shadow.html +++ b/html/shadow.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
@@ -34,12 +35,39 @@

Task Shadow Files

+ A shadow file is a text file containing a copy of a task + report. It is automatically maintained by task whenever + something changes in the task database. +

+

+ This means there is always a current version of the task + report kept in a text file. Products such as + Samurize, + MkConsole, + or + GeekTool + can display this file on the computer desktop, so that it + is readily visible. +

+

+ To use a shadow file, edit your .taskrc configuration file, + and add two entries as shown: +

+ 
shadow.file=/path/to/file
+shadow.command=list pri:H
+

+ In this example the shadow file contains a report equivalent + to running "task list pri:H". +

- +

+ You can use any task command that generates a report, and of + course, you can specify any file name, provided the directory + it resides in already exists.

diff --git a/html/shell.html b/html/shell.html index 6bade3cc6..ad33441b4 100644 --- a/html/shell.html +++ b/html/shell.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
diff --git a/html/simple.html b/html/simple.html index 85ca5782b..9e7f0f88c 100644 --- a/html/simple.html +++ b/html/simple.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
diff --git a/html/task.html b/html/task.html index 0a9ffc243..e7215e966 100644 --- a/html/task.html +++ b/html/task.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
@@ -54,8 +55,8 @@
  • Date Handling
  • Troubleshooting
  • Old Versions -
  • Filters (coming soon) -
  • Shadow Files (coming soon) +
  • Filters +
  • Shadow Files

    @@ -82,8 +83,6 @@ Mac OS X 10.5 (Leopard) Intel-only: task-1.4.3.pkg ---> - -

    New in version 1.4.3 (10/24/2008)

    +

    New in version 1.4.3 (11/1/2008)

    diff --git a/html/troubleshooting.html b/html/troubleshooting.html index d21b59164..5e3147631 100644 --- a/html/troubleshooting.html +++ b/html/troubleshooting.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web

    • diff --git a/html/usage.html b/html/usage.html index 136ce5e54..451c49653 100644 --- a/html/usage.html +++ b/html/usage.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
    @@ -45,6 +46,7 @@ task info ID task start ID task done ID + task undo ID task projects task tags task summary @@ -57,7 +59,6 @@ task oldest task newest task stats - task usage task export task color task version diff --git a/html/versions.html b/html/versions.html index 409c74fa4..347ed039a 100644 --- a/html/versions.html +++ b/html/versions.html @@ -25,6 +25,7 @@ Date Handling Troubleshooting Old Versions + Task on the Web
    diff --git a/script.txt b/script.txt index e94233329..e7d1913e6 100644 --- a/script.txt +++ b/script.txt @@ -98,7 +98,7 @@ task history History shows general activity - how completed etc, by month And that's it. There are more commands than this - covered in the TUTORIAL file, but this should give + covered in the online documentation, but this should give the basic idea. Thank you for watching. diff --git a/src/.gitignore b/src/.gitignore index 2327b8b98..5761abcfd 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,2 +1 @@ -./Makefile *.o diff --git a/src/Config.cpp b/src/Config.cpp index 571b25c10..03ca730dd 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -112,7 +112,6 @@ void Config::createDefault (const std::string& home) if ((out = fopen (rcFile.c_str (), "w"))) { fprintf (out, "data.location=%s\n", dataDir.c_str ()); - fprintf (out, "command.logging=off\n"); fprintf (out, "confirmation=yes\n"); fprintf (out, "next=2\n"); fprintf (out, "dateformat=m/d/Y\n"); diff --git a/src/TDB.cpp b/src/TDB.cpp index 54f9c31c6..e531f10a1 100644 --- a/src/TDB.cpp +++ b/src/TDB.cpp @@ -37,7 +37,6 @@ TDB::TDB () : mPendingFile ("") , mCompletedFile ("") -, mLogFile ("") , mId (1) { } @@ -54,7 +53,6 @@ void TDB::dataDirectory (const std::string& directory) { mPendingFile = directory + "/pending.data"; mCompletedFile = directory + "/completed.data"; - mLogFile = directory + "/command.log"; } else { @@ -288,58 +286,6 @@ bool TDB::modifyT (const T& t) return overwritePending (pending); } -//////////////////////////////////////////////////////////////////////////////// -bool TDB::logRead (std::vector & entries) const -{ - entries.clear (); - return readLockedFile (mLogFile, entries); -} - -//////////////////////////////////////////////////////////////////////////////// -bool TDB::logCommand (int argc, char** argv) const -{ - // Get time info. - time_t now; - time (&now); - struct tm* t = localtime (&now); - - // Generate timestamp. - char timestamp[20]; - sprintf (timestamp, "%04d-%02d-%02d %02d:%02d:%02d", - t->tm_year + 1900, - t->tm_mon + 1, - t->tm_mday, - t->tm_hour, - t->tm_min, - t->tm_sec); - - std::string command = timestamp; - command += " \""; - for (int i = 0; i < argc; ++i) - command += std::string (i ? " " : "") + argv[i]; - command += "\"\n"; - - if (! access (mLogFile.c_str (), F_OK | W_OK)) - { - FILE* out; - if ((out = fopen (mLogFile.c_str (), "a"))) - { -#ifdef HAVE_FLOCK - int retry = 0; - while (flock (fileno (out), LOCK_EX) && ++retry <= 3) - delay (0.25); -#endif - - fputs (command.c_str (), out); - - fclose (out); - return true; - } - } - - return false; -} - //////////////////////////////////////////////////////////////////////////////// bool TDB::lock (FILE* file) const { diff --git a/src/TDB.h b/src/TDB.h index fe13d7d5b..d335e909b 100644 --- a/src/TDB.h +++ b/src/TDB.h @@ -48,7 +48,6 @@ public: bool addT (const T&); bool modifyT (const T&); bool logRead (std::vector &) const; - bool logCommand (int, char**) const; int gc (); int nextId (); @@ -65,7 +64,6 @@ private: private: std::string mPendingFile; std::string mCompletedFile; - std::string mLogFile; int mId; std::vector mOnChange; }; diff --git a/src/parse.cpp b/src/parse.cpp index 36c4e349c..776480eed 100644 --- a/src/parse.cpp +++ b/src/parse.cpp @@ -142,7 +142,6 @@ static const char* commands[] = "tags", "undelete", "undo", - "usage", "version", "", }; diff --git a/src/report.cpp b/src/report.cpp index 2c61cbf43..e38b39b08 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -1618,85 +1618,6 @@ std::string handleReportGHistory (TDB& tdb, T& task, Config& conf) return out.str (); } -//////////////////////////////////////////////////////////////////////////////// -// A summary of the command usage. Not useful to users, but used to display -// usage statistics for feedback. -// -// 2006-12-04 19:59:43 "task list" -// -std::string handleReportUsage (const TDB& tdb, T& task, Config& conf) -{ - std::stringstream out; - - if (conf.get ("command.logging") == "on") - { - std::map usage; - std::vector all; - tdb.logRead (all); - for (unsigned int i = 0; i < all.size (); ++i) - { - // 0123456789012345678901 - // v 21 - // 2006-12-04 19:59:43 "task list" - std::string command = all[i].substr (21, all[i].length () - 22); - - // Parse as a command line. - std::vector args; - split (args, command, " "); - - try - { - T task; - std::string commandName; - parse (args, commandName, task, conf); - - usage[commandName]++; - } - - // Deliberately ignore errors from parsing the command log, as there may - // be commands from a prior version of task in there, which were - // abbreviated, and are now ambiguous. - catch (...) {} - } - - // Now render the table. - Table table; - table.addColumn ("Command"); - table.addColumn ("Frequency"); - - if (conf.get ("color", true)) - { - table.setColumnUnderline (0); - table.setColumnUnderline (1); - } - else - table.setTableDashedUnderline (); - - table.setColumnJustification (1, Table::right); - table.sortOn (1, Table::descendingNumeric); - table.setDateFormat (conf.get ("dateformat", "m/d/Y")); - - foreach (i, usage) - { - int row = table.addRow (); - table.addCell (row, 0, (i->first == "" ? "(modify)" : i->first)); - table.addCell (row, 1, i->second); - } - - if (table.rowCount ()) - out << optionalBlankLine (conf) - << table.render () - << std::endl; - else - out << "No usage." << std::endl; - } - else - out << "Command logging is not enabled, so no history has been kept." - << std::endl; - - return out.str (); -} - //////////////////////////////////////////////////////////////////////////////// std::string renderMonths ( int firstMonth, diff --git a/src/task.cpp b/src/task.cpp index a0a097c59..cdb4e0b13 100644 --- a/src/task.cpp +++ b/src/task.cpp @@ -183,10 +183,6 @@ static void shortUsage (Config& conf) table.addCell (row, 1, "task stats"); table.addCell (row, 2, "Shows task database statistics"); - row = table.addRow (); - table.addCell (row, 1, "task usage"); - table.addCell (row, 2, "Shows task command usage frequency"); - row = table.addRow (); table.addCell (row, 1, "task export"); table.addCell (row, 2, "Exports all tasks as a CSV file"); @@ -304,10 +300,6 @@ int main (int argc, char** argv) std::string dataLocation = expandPath (conf.get ("data.location")); tdb.dataDirectory (dataLocation); - // Log commands, if desired. - if (conf.get ("command.logging") == "on") - tdb.logCommand (argc, argv); - // Set up TDB callback. std::string shadowFile = expandPath (conf.get ("shadow.file")); if (shadowFile != "") @@ -785,7 +777,6 @@ std::string runTaskCommand ( else if (command == "start") { out = handleStart (tdb, task, conf); } else if (command == "undo") { out = handleUndo (tdb, task, conf); } else if (command == "stats") { out = handleReportStats (tdb, task, conf); } - else if (command == "usage") { out = handleReportUsage (tdb, task, conf); } else if (command == "list") { if (gc) tdb.gc (); out = handleList (tdb, task, conf); } else if (command == "long") { if (gc) tdb.gc (); out = handleLongList (tdb, task, conf); } else if (command == "ls") { if (gc) tdb.gc (); out = handleSmallList (tdb, task, conf); } diff --git a/src/task.h b/src/task.h index f7d85c6a5..6bd865b56 100644 --- a/src/task.h +++ b/src/task.h @@ -95,7 +95,6 @@ std::string handleReportSummary (TDB&, T&, Config&); std::string handleReportNext (TDB&, T&, Config&); std::string handleReportHistory (TDB&, T&, Config&); std::string handleReportGHistory (TDB&, T&, Config&); -std::string handleReportUsage (const TDB&, T&, Config&); std::string handleReportCalendar (TDB&, T&, Config&); std::string handleReportActive (TDB&, T&, Config&); std::string handleReportOverdue (TDB&, T&, Config&); diff --git a/src/tests/out b/src/tests/out deleted file mode 100755 index c0b81f3b4..000000000 --- a/src/tests/out +++ /dev/null @@ -1,15 +0,0 @@ -./task li due:monday -./task li due:tuesday -./task li due:wednesday -./task li due:thursday -./task li due:friday -./task li due:saturday -./task li due:sunday -./task li due:yesterday -./task li due:today -./task li due:tomorrow -./task li due:eow -./task li due:eom -./task li due:eoy -./task li due:21st - diff --git a/task.pmdoc/01task.xml b/task.pmdoc/01task.xml index 585107ecd..8e25f6b7a 100644 --- a/task.pmdoc/01task.xml +++ b/task.pmdoc/01task.xml @@ -1 +1 @@ -com.beckingham.task141.task.pkg1/Users/paul/task.git/binary/task/usr/local/binparentlocationTyperelocatableinstallTo.pathinstallTo01task-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +com.beckingham.task142.task.pkg/Users/paul/task.git/binary/task/usr/local/binparentlocationTyperelocatableversioninstallTo.pathinstallTo01task-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/task.pmdoc/index.xml b/task.pmdoc/index.xml index 05fd05d2a..4b1ce006c 100644 --- a/task.pmdoc/index.xml +++ b/task.pmdoc/index.xml @@ -1 +1 @@ -Task 1.4.1/Users/paul/task.git/binary/task-1.4.1.pkgcom.beckingham/Users/paul/task.git/binary/COPYING.txt/Users/paul/task.git/binary/README.txt01task.xmlproperties.titleproperties.systemDomainproperties.anywhereDomain \ No newline at end of file +Task 1.4.2/Users/paul/Documents/task-1.4.2.pkgcom.beckingham/Users/paul/task.git/binary/COPYING.txt/Users/paul/task.git/binary/README.txt01task.xmlproperties.titleproperties.anywhereDomainproperties.systemDomain \ No newline at end of file