gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Integration - removed T

Browse Source 
- T.cpp no longer compiled and linked.  Kept for reference, but no
  longer part of task.
This commit is contained in:
Paul Beckingham
2009-06-13 19:03:35 -04:00
parent c89a222c7c
commit 113c15ef2f
8 changed files with 82 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@@ -8,5 +8,4 @@ task_SOURCES = Att.cpp Cmd.cpp Config.cpp Context.cpp Date.cpp Duration.cpp \
Att.h Cmd.h Config.h Context.h Date.h Duration.h Filter.h \ Att.h Cmd.h Config.h Context.h Date.h Duration.h Filter.h \
Grid.h Keymap.h Location.h Nibbler.h Record.h Sequence.h \ Grid.h Keymap.h Location.h Nibbler.h Record.h Sequence.h \
StringTable.h Subst.h Task.h TDB2.h Table.h Timer.h color.h \ StringTable.h Subst.h Task.h TDB2.h Table.h Timer.h color.h \
i18n.h main.h text.h util.h \ i18n.h main.h text.h util.h
T.cpp T.h

108
src/T.h
View File

@@ -1,108 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
// task - a command line task list manager.
//
// Copyright 2006 - 2009, Paul Beckingham.
// All rights reserved.
//
// This program is free software; you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation; either version 2 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
// details.
//
// You should have received a copy of the GNU General Public License along with
// this program; if not, write to the
//
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor,
// Boston, MA
// 02110-1301
// USA
//
////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDED_T
#define INCLUDED_T
#include <string>
#include <vector>
#include <map>
// Length of longest line.
#define T_LINE_MAX 32768
class T
{
public:
enum status {pending, completed, deleted, recurring};
T (); // Default constructor
T (const std::string&); // Initialize by parsing storage format
T (const T&); // Copy constructor
T& operator= (const T&); // Assignment operator
~T (); // Destructor
std::string getUUID () const { return mUUID; }
void setUUID (const std::string& uuid) { mUUID = uuid; }
int getId () const { return mId; }
void setId (int id) { mId = id; mSequence.push_back (id); }
std::vector <int> getAllIds () const { return mSequence; }
void addId (int id) { if (mId == 0) mId = id; mSequence.push_back (id); }
status getStatus () const { return mStatus; }
void setStatus (status s) { mStatus = s; }
const std::string getDescription () const { return mDescription; }
void setDescription (const std::string& description) { mDescription = description; }
void getSubstitution (std::string&, std::string&, bool&) const;
void setSubstitution (const std::string&, const std::string&, bool);
bool hasTag (const std::string&) const;
void getRemoveTags (std::vector<std::string>&); // SPECIAL
void addRemoveTag (const std::string&); // SPECIAL
int getTagCount () const;
void getTags (std::vector<std::string>&) const;
void addTag (const std::string&);
void addTags (const std::vector <std::string>&);
void removeTag (const std::string&);
void removeTags ();
void getAttributes (std::map<std::string, std::string>&);
const std::string getAttribute (const std::string&);
void setAttribute (const std::string&, const std::string&);
void removeAttribute (const std::string&);
void getAnnotations (std::map <time_t, std::string>&) const;
void setAnnotations (const std::map <time_t, std::string>&);
void addAnnotation (const std::string&);
const std::string compose () const;
const std::string composeCSV ();
void parse (const std::string&);
bool validate () const;
private:
int determineVersion (const std::string&);
private:
status mStatus;
std::string mUUID;
int mId;
std::vector <int> mSequence;
std::string mDescription;
std::vector<std::string> mTags;
std::vector<std::string> mRemoveTags;
std::map<std::string, std::string> mAttributes;
std::string mFrom;
std::string mTo;
bool mGlobal;
std::map <time_t, std::string> mAnnotations;
};
#endif
////////////////////////////////////////////////////////////////////////////////

1
src/custom.cpp
View File

@@ -38,7 +38,6 @@
#include "Context.h" #include "Context.h"
#include "Date.h" #include "Date.h"
#include "Table.h" #include "Table.h"
#include "T.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "main.h" #include "main.h"

159
src/edit.cpp
View File

@@ -33,7 +33,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include "T.h"
#include "Date.h" #include "Date.h"
#include "Duration.h" #include "Duration.h"
#include "text.h" #include "text.h"
@@ -94,14 +93,14 @@ static std::string findDate (
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Obsolete - use Task::statusToText // Obsolete - use Task::statusToText
static std::string formatStatus (T& task) static std::string formatStatus (Task& task)
{ {
switch (task.getStatus ()) switch (task.getStatus ())
{ {
case T::pending: return "Pending"; break; case Task::pending: return "Pending"; break;
case T::completed: return "Completed"; break; case Task::completed: return "Completed"; break;
case T::deleted: return "Deleted"; break; case Task::deleted: return "Deleted"; break;
case T::recurring: return "Recurring"; break; case Task::recurring: return "Recurring"; break;
} }
return ""; return "";
@@ -109,10 +108,10 @@ static std::string formatStatus (T& task)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static std::string formatDate ( static std::string formatDate (
T& task, Task& task,
const std::string& attribute) const std::string& attribute)
{ {
std::string value = task.getAttribute (attribute); std::string value = task.get (attribute);
if (value.length ()) if (value.length ())
{ {
Date dt (::atoi (value.c_str ())); Date dt (::atoi (value.c_str ()));
@@ -123,7 +122,7 @@ static std::string formatDate (
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static std::string formatTask (T task) static std::string formatTask (Task task)
{ {
std::stringstream before; std::stringstream before;
before << "# The 'task edit <id>' command allows you to modify all aspects of a task" << std::endl before << "# The 'task edit <id>' command allows you to modify all aspects of a task" << std::endl
@@ -143,13 +142,13 @@ static std::string formatTask (T task)
<< "#" << std::endl << "#" << std::endl
<< "# Name Editable details" << std::endl << "# Name Editable details" << std::endl
<< "# ----------------- ----------------------------------------------------" << std::endl << "# ----------------- ----------------------------------------------------" << std::endl
<< "# ID: " << task.getId () << std::endl << "# ID: " << task.id << std::endl
<< "# UUID: " << task.getUUID () << std::endl << "# UUID: " << task.get ("uuid") << std::endl
<< "# Status: " << formatStatus (task) << std::endl << "# Status: " << formatStatus (task) << std::endl
<< "# Mask: " << task.getAttribute ("mask") << std::endl << "# Mask: " << task.get ("mask") << std::endl
<< "# iMask: " << task.getAttribute ("imask") << std::endl << "# iMask: " << task.get ("imask") << std::endl
<< " Project: " << task.getAttribute ("project") << std::endl << " Project: " << task.get ("project") << std::endl
<< " Priority: " << task.getAttribute ("priority") << std::endl; << " Priority: " << task.get ("priority") << std::endl;
std::vector <std::string> tags; std::vector <std::string> tags;
task.getTags (tags); task.getTags (tags);
@@ -159,19 +158,19 @@ static std::string formatTask (T task)
<< " Tags: " << allTags << std::endl << " Tags: " << allTags << std::endl
<< "# The description field is allowed to wrap and use multiple lines. Task" << std::endl << "# The description field is allowed to wrap and use multiple lines. Task" << std::endl
<< "# will combine them." << std::endl << "# will combine them." << std::endl
<< " Description: " << task.getDescription () << std::endl << " Description: " << task.get ("description") << std::endl
<< " Created: " << formatDate (task, "entry") << std::endl << " Created: " << formatDate (task, "entry") << std::endl
<< " Started: " << formatDate (task, "start") << std::endl << " Started: " << formatDate (task, "start") << std::endl
<< " Ended: " << formatDate (task, "end") << std::endl << " Ended: " << formatDate (task, "end") << std::endl
<< " Due: " << formatDate (task, "due") << std::endl << " Due: " << formatDate (task, "due") << std::endl
<< " Until: " << formatDate (task, "until") << std::endl << " Until: " << formatDate (task, "until") << std::endl
<< " Recur: " << task.getAttribute ("recur") << std::endl << " Recur: " << task.get ("recur") << std::endl
<< " Parent: " << task.getAttribute ("parent") << std::endl << " Parent: " << task.get ("parent") << std::endl
<< " Foreground color: " << task.getAttribute ("fg") << std::endl << " Foreground color: " << task.get ("fg") << std::endl
<< " Background color: " << task.getAttribute ("bg") << std::endl << " Background color: " << task.get ("bg") << std::endl
<< "# Annotations look like this: <date> <text>, and there can be any number" << std::endl << "# Annotations look like this: <date> <text>, and there can be any number" << std::endl
<< "# of them." << std::endl; << "# of them." << std::endl;
/*
std::map <time_t, std::string> annotations; std::map <time_t, std::string> annotations;
task.getAnnotations (annotations); task.getAnnotations (annotations);
foreach (anno, annotations) foreach (anno, annotations)
@@ -180,7 +179,7 @@ static std::string formatTask (T task)
before << " Annotation: " << dt.toString (context.config.get ("dateformat", "m/d/Y")) before << " Annotation: " << dt.toString (context.config.get ("dateformat", "m/d/Y"))
<< " " << anno->second << std::endl; << " " << anno->second << std::endl;
} }
*/
before << " Annotation: " << std::endl before << " Annotation: " << std::endl
<< " Annotation: " << std::endl << " Annotation: " << std::endl
<< "# End" << std::endl; << "# End" << std::endl;
@@ -188,40 +187,40 @@ static std::string formatTask (T task)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void parseTask (T& task, const std::string& after) static void parseTask (Task& task, const std::string& after)
{ {
// project // project
std::string value = findValue (after, "Project:"); std::string value = findValue (after, "Project:");
if (task.getAttribute ("project") != value) if (task.get ("project") != value)
{ {
if (value != "") if (value != "")
{ {
std::cout << "Project modified." << std::endl; std::cout << "Project modified." << std::endl;
task.setAttribute ("project", value); task.set ("project", value);
} }
else else
{ {
std::cout << "Project deleted." << std::endl; std::cout << "Project deleted." << std::endl;
task.removeAttribute ("project"); task.remove ("project");
} }
} }
// priority // priority
value = findValue (after, "Priority:"); value = findValue (after, "Priority:");
if (task.getAttribute ("priority") != value) if (task.get ("priority") != value)
{ {
if (value != "") if (value != "")
{ {
if (Att::validNameValue ("priority", "", value)) if (Att::validNameValue ("priority", "", value))
{ {
std::cout << "Priority modified." << std::endl; std::cout << "Priority modified." << std::endl;
task.setAttribute ("priority", value); task.set ("priority", value);
} }
} }
else else
{ {
std::cout << "Priority deleted." << std::endl; std::cout << "Priority deleted." << std::endl;
task.removeAttribute ("priority"); task.remove ("priority");
} }
} }
@@ -229,17 +228,19 @@ static void parseTask (T& task, const std::string& after)
value = findValue (after, "Tags:"); value = findValue (after, "Tags:");
std::vector <std::string> tags; std::vector <std::string> tags;
split (tags, value, ' '); split (tags, value, ' ');
/*
task.removeTags (); task.removeTags ();
*/
task.addTags (tags); task.addTags (tags);
// description. // description.
value = findValue (after, "Description: "); value = findValue (after, "Description: ");
if (task.getDescription () != value) if (task.get ("description") != value)
{ {
if (value != "") if (value != "")
{ {
std::cout << "Description modified." << std::endl; std::cout << "Description modified." << std::endl;
task.setDescription (value); task.set ("description", value);
} }
else else
throw std::string ("Cannot remove description."); throw std::string ("Cannot remove description.");
@@ -251,11 +252,11 @@ static void parseTask (T& task, const std::string& after)
{ {
Date edited (::atoi (value.c_str ())); Date edited (::atoi (value.c_str ()));
Date original (::atoi (task.getAttribute ("entry").c_str ())); Date original (::atoi (task.get ("entry").c_str ()));
if (!original.sameDay (edited)) if (!original.sameDay (edited))
{ {
std::cout << "Creation date modified." << std::endl; std::cout << "Creation date modified." << std::endl;
task.setAttribute ("entry", value); task.set ("entry", value);
} }
} }
else else
@@ -267,27 +268,27 @@ static void parseTask (T& task, const std::string& after)
{ {
Date edited (::atoi (value.c_str ())); Date edited (::atoi (value.c_str ()));
if (task.getAttribute ("start") != "") if (task.get ("start") != "")
{ {
Date original (::atoi (task.getAttribute ("start").c_str ())); Date original (::atoi (task.get ("start").c_str ()));
if (!original.sameDay (edited)) if (!original.sameDay (edited))
{ {
std::cout << "Start date modified." << std::endl; std::cout << "Start date modified." << std::endl;
task.setAttribute ("start", value); task.set ("start", value);
} }
} }
else else
{ {
std::cout << "Start date modified." << std::endl; std::cout << "Start date modified." << std::endl;
task.setAttribute ("start", value); task.set ("start", value);
} }
} }
else else
{ {
if (task.getAttribute ("start") != "") if (task.get ("start") != "")
{ {
std::cout << "Start date removed." << std::endl; std::cout << "Start date removed." << std::endl;
task.removeAttribute ("start"); task.remove ("start");
} }
} }
@@ -297,25 +298,25 @@ static void parseTask (T& task, const std::string& after)
{ {
Date edited (::atoi (value.c_str ())); Date edited (::atoi (value.c_str ()));
if (task.getAttribute ("end") != "") if (task.get ("end") != "")
{ {
Date original (::atoi (task.getAttribute ("end").c_str ())); Date original (::atoi (task.get ("end").c_str ()));
if (!original.sameDay (edited)) if (!original.sameDay (edited))
{ {
std::cout << "Done date modified." << std::endl; std::cout << "Done date modified." << std::endl;
task.setAttribute ("end", value); task.set ("end", value);
} }
} }
else if (task.getStatus () != T::deleted) else if (task.getStatus () != Task::deleted)
throw std::string ("Cannot set a done date on a pending task."); throw std::string ("Cannot set a done date on a pending task.");
} }
else else
{ {
if (task.getAttribute ("end") != "") if (task.get ("end") != "")
{ {
std::cout << "Done date removed." << std::endl; std::cout << "Done date removed." << std::endl;
task.setStatus (T::pending); task.setStatus (Task::pending);
task.removeAttribute ("end"); task.remove ("end");
} }
} }
@@ -325,34 +326,34 @@ static void parseTask (T& task, const std::string& after)
{ {
Date edited (::atoi (value.c_str ())); Date edited (::atoi (value.c_str ()));
if (task.getAttribute ("due") != "") if (task.get ("due") != "")
{ {
Date original (::atoi (task.getAttribute ("due").c_str ())); Date original (::atoi (task.get ("due").c_str ()));
if (!original.sameDay (edited)) if (!original.sameDay (edited))
{ {
std::cout << "Due date modified." << std::endl; std::cout << "Due date modified." << std::endl;
task.setAttribute ("due", value); task.set ("due", value);
} }
} }
else else
{ {
std::cout << "Due date modified." << std::endl; std::cout << "Due date modified." << std::endl;
task.setAttribute ("due", value); task.set ("due", value);
} }
} }
else else
{ {
if (task.getAttribute ("due") != "") if (task.get ("due") != "")
{ {
if (task.getStatus () == T::recurring || if (task.getStatus () == Task::recurring ||
task.getAttribute ("parent") != "") task.get ("parent") != "")
{ {
std::cout << "Cannot remove a due date from a recurring task." << std::endl; std::cout << "Cannot remove a due date from a recurring task." << std::endl;
} }
else else
{ {
std::cout << "Due date removed." << std::endl; std::cout << "Due date removed." << std::endl;
task.removeAttribute ("due"); task.remove ("due");
} }
} }
} }
@@ -363,33 +364,33 @@ static void parseTask (T& task, const std::string& after)
{ {
Date edited (::atoi (value.c_str ())); Date edited (::atoi (value.c_str ()));
if (task.getAttribute ("until") != "") if (task.get ("until") != "")
{ {
Date original (::atoi (task.getAttribute ("until").c_str ())); Date original (::atoi (task.get ("until").c_str ()));
if (!original.sameDay (edited)) if (!original.sameDay (edited))
{ {
std::cout << "Until date modified." << std::endl; std::cout << "Until date modified." << std::endl;
task.setAttribute ("until", value); task.set ("until", value);
} }
} }
else else
{ {
std::cout << "Until date modified." << std::endl; std::cout << "Until date modified." << std::endl;
task.setAttribute ("until", value); task.set ("until", value);
} }
} }
else else
{ {
if (task.getAttribute ("until") != "") if (task.get ("until") != "")
{ {
std::cout << "Until date removed." << std::endl; std::cout << "Until date removed." << std::endl;
task.removeAttribute ("until"); task.remove ("until");
} }
} }
// recur // recur
value = findValue (after, "Recur:"); value = findValue (after, "Recur:");
if (value != task.getAttribute ("recur")) if (value != task.get ("recur"))
{ {
if (value != "") if (value != "")
{ {
@@ -397,10 +398,10 @@ static void parseTask (T& task, const std::string& after)
if (d.valid (value)) if (d.valid (value))
{ {
std::cout << "Recurrence modified." << std::endl; std::cout << "Recurrence modified." << std::endl;
if (task.getAttribute ("due") != "") if (task.get ("due") != "")
{ {
task.setAttribute ("recur", value); task.set ("recur", value);
task.setStatus (T::recurring); task.setStatus (Task::recurring);
} }
else else
throw std::string ("A recurring task must have a due date."); throw std::string ("A recurring task must have a due date.");
@@ -411,59 +412,59 @@ static void parseTask (T& task, const std::string& after)
else else
{ {
std::cout << "Recurrence removed." << std::endl; std::cout << "Recurrence removed." << std::endl;
task.setStatus (T::pending); task.setStatus (Task::pending);
task.removeAttribute ("recur"); task.remove ("recur");
task.removeAttribute ("until"); task.remove ("until");
task.removeAttribute ("mask"); task.remove ("mask");
task.removeAttribute ("imask"); task.remove ("imask");
} }
} }
// parent // parent
value = findValue (after, "Parent:"); value = findValue (after, "Parent:");
if (value != task.getAttribute ("parent")) if (value != task.get ("parent"))
{ {
if (value != "") if (value != "")
{ {
std::cout << "Parent UUID modified." << std::endl; std::cout << "Parent UUID modified." << std::endl;
task.setAttribute ("parent", value); task.set ("parent", value);
} }
else else
{ {
std::cout << "Parent UUID removed." << std::endl; std::cout << "Parent UUID removed." << std::endl;
task.removeAttribute ("parent"); task.remove ("parent");
} }
} }
// fg // fg
value = findValue (after, "Foreground color:"); value = findValue (after, "Foreground color:");
if (value != task.getAttribute ("fg")) if (value != task.get ("fg"))
{ {
if (value != "") if (value != "")
{ {
std::cout << "Foreground color modified." << std::endl; std::cout << "Foreground color modified." << std::endl;
task.setAttribute ("fg", value); task.set ("fg", value);
} }
else else
{ {
std::cout << "Foreground color removed." << std::endl; std::cout << "Foreground color removed." << std::endl;
task.removeAttribute ("fg"); task.remove ("fg");
} }
} }
// bg // bg
value = findValue (after, "Background color:"); value = findValue (after, "Background color:");
if (value != task.getAttribute ("bg")) if (value != task.get ("bg"))
{ {
if (value != "") if (value != "")
{ {
std::cout << "Background color modified." << std::endl; std::cout << "Background color modified." << std::endl;
task.setAttribute ("bg", value); task.set ("bg", value);
} }
else else
{ {
std::cout << "Background color removed." << std::endl; std::cout << "Background color removed." << std::endl;
task.removeAttribute ("bg"); task.remove ("bg");
} }
} }
@@ -491,7 +492,9 @@ static void parseTask (T& task, const std::string& after)
} }
} }
/*
task.setAnnotations (annotations); task.setAnnotations (annotations);
*/
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

1
src/import.cpp
View File

@@ -29,7 +29,6 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include "Date.h" #include "Date.h"
#include "T.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "main.h" #include "main.h"

1
src/report.cpp
View File

@@ -38,7 +38,6 @@
#include "Context.h" #include "Context.h"
#include "Date.h" #include "Date.h"
#include "Table.h" #include "Table.h"
#include "T.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "main.h" #include "main.h"

1
src/rules.cpp
View File

@@ -29,7 +29,6 @@
#include "Context.h" #include "Context.h"
#include "Table.h" #include "Table.h"
#include "Date.h" #include "Date.h"
#include "T.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "main.h" #include "main.h"

1
src/valid.cpp
View File

@@ -33,7 +33,6 @@
#include "Context.h" #include "Context.h"
#include "Date.h" #include "Date.h"
#include "Duration.h" #include "Duration.h"
#include "T.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "color.h" #include "color.h"