GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 17:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Enhancements - edit command

Browse source 
- Implemented edit command.
This commit is contained in:
Paul Beckingham 2009-06-17 00:03:09 -04:00
parent b2c76f6123
commit 07cf8d6ee8
2 changed files with 38 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Context.cpp
View file

@ -197,13 +197,9 @@ std::string Context::dispatch ()
else if (cmd.command == "start") { out = handleStart (); } else if (cmd.command == "start") { out = handleStart (); }
else if (cmd.command == "stop") { out = handleStop (); } else if (cmd.command == "stop") { out = handleStop (); }
else if (cmd.command == "export") { out = handleExport (); } else if (cmd.command == "export") { out = handleExport (); }
/*
else if (cmd.command == "import") { out = handleImport (); } else if (cmd.command == "import") { out = handleImport (); }
*/
else if (cmd.command == "duplicate") { out = handleDuplicate (); } else if (cmd.command == "duplicate") { out = handleDuplicate (); }
/*
else if (cmd.command == "edit") { out = handleEdit (); } else if (cmd.command == "edit") { out = handleEdit (); }
*/
else if (cmd.command == "" && else if (cmd.command == "" &&
sequence.size ()) { out = handleModify (); } sequence.size ()) { out = handleModify (); }

91
src/edit.cpp
View file

@ -91,21 +91,6 @@ static std::string findDate (
return ""; return "";
} }
////////////////////////////////////////////////////////////////////////////////
// Obsolete - use Task::statusToText
static std::string formatStatus (Task& task)
{
switch (task.getStatus ())
{
case Task::pending: return "Pending"; break;
case Task::completed: return "Completed"; break;
case Task::deleted: return "Deleted"; break;
case Task::recurring: return "Recurring"; break;
}
return "";
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static std::string formatDate ( static std::string formatDate (
Task& task, Task& task,
@ -143,12 +128,12 @@ static std::string formatTask (Task task)
<< "# Name Editable details" << std::endl << "# Name Editable details" << std::endl
<< "# ----------------- ----------------------------------------------------" << std::endl << "# ----------------- ----------------------------------------------------" << std::endl
<< "# ID: " << task.id << std::endl << "# ID: " << task.id << std::endl
<< "# UUID: " << task.get ("uuid") << std::endl << "# UUID: " << task.get ("uuid") << std::endl
<< "# Status: " << formatStatus (task) << std::endl << "# Status: " << ucFirst (Task::statusToText (task.getStatus ())) << std::endl
<< "# Mask: " << task.get ("mask") << std::endl << "# Mask: " << task.get ("mask") << std::endl
<< "# iMask: " << task.get ("imask") << std::endl << "# iMask: " << task.get ("imask") << std::endl
<< " Project: " << task.get ("project") << std::endl << " Project: " << task.get ("project") << std::endl
<< " Priority: " << task.get ("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);
@ -158,28 +143,28 @@ static std::string formatTask (Task 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.get ("description") << 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.get ("recur") << std::endl << " Recur: " << task.get ("recur") << std::endl
<< " Parent: " << task.get ("parent") << std::endl << " Parent: " << task.get ("parent") << std::endl
<< " Foreground color: " << task.get ("fg") << std::endl << " Foreground color: " << task.get ("fg") << std::endl
<< " Background color: " << task.get ("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::vector <Att> annotations;
task.getAnnotations (annotations); task.getAnnotations (annotations);
foreach (anno, annotations) foreach (anno, annotations)
{ {
Date dt (anno->first); Date dt (::atoi (anno->name ().substr (11, std::string::npos).c_str ()));
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->value () << std::endl;
} }
*/
before << " Annotation: " << std::endl before << " Annotation: " << std::endl
<< " Annotation: " << std::endl << " Annotation: " << std::endl
<< "# End" << std::endl; << "# End" << std::endl;
@ -228,9 +213,7 @@ static void parseTask (Task& 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.remove ("tags");
task.removeTags ();
*/
task.addTags (tags); task.addTags (tags);
// description. // description.
@ -469,7 +452,7 @@ static void parseTask (Task& task, const std::string& after)
} }
// Annotations // Annotations
std::map <time_t, std::string> annotations; std::vector <Att> annotations;
std::string::size_type found = 0; std::string::size_type found = 0;
while ((found = after.find ("Annotation:", found)) != std::string::npos) while ((found = after.find ("Annotation:", found)) != std::string::npos)
{ {
@ -486,15 +469,15 @@ static void parseTask (Task& task, const std::string& after)
if (gap != std::string::npos) if (gap != std::string::npos)
{ {
Date when (value.substr (0, gap)); Date when (value.substr (0, gap));
std::stringstream name;
name << "annotation_" << when.toEpoch ();
std::string text = trim (value.substr (gap, std::string::npos), "\t "); std::string text = trim (value.substr (gap, std::string::npos), "\t ");
annotations[when.toEpoch ()] = text; annotations.push_back (Att (name.str (), text));
} }
} }
} }
/*
task.setAnnotations (annotations); task.setAnnotations (annotations);
*/
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -504,12 +487,16 @@ static void parseTask (Task& task, const std::string& after)
std::string handleEdit () std::string handleEdit ()
{ {
std::stringstream out; std::stringstream out;
/*
std::vector <T> all;
tdb.allPendingT (all);
filterSequence (all, task); std::vector <Task> tasks;
foreach (seq, all) context.tdb.lock (context.config.get ("locking", true));
context.tdb.loadPending (tasks, context.filter);
handleRecurrence (tasks);
// Filter sequence.
context.filter.applySequence (tasks, context.sequence);
foreach (task, tasks)
{ {
// Check for file permissions. // Check for file permissions.
std::string dataLocation = expandPath (context.config.get ("data.location")); std::string dataLocation = expandPath (context.config.get ("data.location"));
@ -518,14 +505,14 @@ std::string handleEdit ()
// Create a temp file name in data.location. // Create a temp file name in data.location.
std::stringstream pattern; std::stringstream pattern;
pattern << dataLocation << "/task." << seq->getId () << ".XXXXXX"; pattern << dataLocation << "/task." << task->id << ".XXXXXX";
char cpattern [PATH_MAX]; char cpattern [PATH_MAX];
strcpy (cpattern, pattern.str ().c_str ()); strcpy (cpattern, pattern.str ().c_str ());
mkstemp (cpattern); mkstemp (cpattern);
char* file = cpattern; char* file = cpattern;
// Format the contents, T -> text, write to a file. // Format the contents, T -> text, write to a file.
std::string before = formatTask (*seq); std::string before = formatTask (*task);
spit (file, before); spit (file, before);
// Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi // Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi
@ -550,11 +537,7 @@ ARE_THESE_REALLY_HARMFUL:
std::string after; std::string after;
slurp (file, after, false); slurp (file, after, false);
// TODO Remove this debugging code. // Update task based on what can be parsed back out of the file, but only
//spit ("./before", before);
//spit ("./after", after);
// Update seq based on what can be parsed back out of the file, but only
// if changes were made. // if changes were made.
if (before != after) if (before != after)
{ {
@ -564,8 +547,8 @@ ARE_THESE_REALLY_HARMFUL:
try try
{ {
parseTask (*seq, after); parseTask (*task, after);
tdb.modifyT (*seq); context.tdb.update (*task);
} }
catch (std::string& e) catch (std::string& e)
@ -593,7 +576,9 @@ ARE_THESE_REALLY_HARMFUL:
unlink (file); unlink (file);
} }
*/ context.tdb.commit ();
context.tdb.unlock ();
return out.str (); return out.str ();
} }