mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
Enhancements
- Added stubbed DOM code. - Added stubbed TDB2 code.
This commit is contained in:
parent
2ce54f10f8
commit
9b3f565e90
10 changed files with 2157 additions and 15 deletions
|
@ -3,21 +3,21 @@ include_directories (${CMAKE_SOURCE_DIR}/src
|
|||
|
||||
set (task_SRCS API.cpp API.h Att.cpp Att.h Cmd.cpp Cmd.h Color.cpp Color.h
|
||||
Config.cpp Config.h Context.cpp Context.h Date.cpp Date.h
|
||||
Directory.cpp Directory.h Duration.cpp Duration.h File.cpp
|
||||
File.h Filter.cpp Filter.h feedback.cpp Grid.cpp Grid.h Hooks.cpp
|
||||
Hooks.h JSON.cpp JSON.h Keymap.cpp Keymap.h Location.cpp
|
||||
Location.h Nibbler.cpp Nibbler.h Path.cpp Path.h Permission.cpp
|
||||
Permission.h Record.cpp Record.h Rectangle.cpp Rectangle.h
|
||||
Sequence.cpp Sequence.h Subst.cpp Subst.h TDB.cpp TDB.h Table.cpp
|
||||
Table.h Task.cpp Task.h Taskmod.cpp Taskmod.h Thread.cpp Thread.h
|
||||
Timer.cpp Timer.h Transport.cpp Transport.h TransportSSH.cpp
|
||||
TransportSSH.h TransportRSYNC.cpp TransportRSYNC.h
|
||||
TransportCurl.cpp TransportCurl.h Tree.cpp Tree.h burndown.cpp
|
||||
command.cpp custom.cpp dependency.cpp diag.cpp edit.cpp
|
||||
export.cpp history.cpp i18n.h import.cpp interactive.cpp
|
||||
recur.cpp report.cpp rules.cpp rx.cpp rx.h text.cpp text.h
|
||||
utf8.cpp utf8.h util.cpp util.h Uri.cpp Uri.h Variant.cpp
|
||||
Variant.h)
|
||||
Directory.cpp Directory.h DOM.cpp DOM.h Duration.cpp Duration.h
|
||||
File.cpp File.h Filter.cpp Filter.h feedback.cpp Grid.cpp Grid.h
|
||||
Hooks.cpp Hooks.h JSON.cpp JSON.h Keymap.cpp Keymap.h
|
||||
Location.cpp Location.h Nibbler.cpp Nibbler.h Path.cpp Path.h
|
||||
Permission.cpp Permission.h Record.cpp Record.h Rectangle.cpp
|
||||
Rectangle.h Sequence.cpp Sequence.h Subst.cpp Subst.h TDB.cpp
|
||||
TDB.h Table.cpp TDB2.cpp TDB2.h Table.h Task.cpp Task.h
|
||||
Taskmod.cpp Taskmod.h Thread.cpp Thread.h Timer.cpp Timer.h
|
||||
Transport.cpp Transport.h TransportSSH.cpp TransportSSH.h
|
||||
TransportRSYNC.cpp TransportRSYNC.h TransportCurl.cpp
|
||||
TransportCurl.h Tree.cpp Tree.h burndown.cpp command.cpp
|
||||
custom.cpp dependency.cpp diag.cpp edit.cpp export.cpp
|
||||
history.cpp i18n.h import.cpp interactive.cpp recur.cpp
|
||||
report.cpp rules.cpp rx.cpp rx.h text.cpp text.h utf8.cpp utf8.h
|
||||
util.cpp util.h Uri.cpp Uri.h Variant.cpp Variant.h)
|
||||
|
||||
add_library (task STATIC ${task_SRCS})
|
||||
add_executable (task_executable main.cpp)
|
||||
|
|
|
@ -51,10 +51,12 @@ Context::Context ()
|
|||
, subst ()
|
||||
, task ()
|
||||
, tdb ()
|
||||
, tdb2 ()
|
||||
, program ("")
|
||||
, file_override ("")
|
||||
, var_overrides ("")
|
||||
, cmd ()
|
||||
, dom ()
|
||||
, inShadow (false)
|
||||
, terminal_width (0)
|
||||
, terminal_height (0)
|
||||
|
|
|
@ -35,7 +35,9 @@
|
|||
#include "Cmd.h"
|
||||
#include "Task.h"
|
||||
#include "TDB.h"
|
||||
#include "TDB2.h"
|
||||
#include "Hooks.h"
|
||||
#include "DOM.h"
|
||||
|
||||
class Context
|
||||
{
|
||||
|
@ -83,6 +85,7 @@ public:
|
|||
Subst subst;
|
||||
Task task;
|
||||
TDB tdb;
|
||||
TDB2 tdb2;
|
||||
std::string program;
|
||||
std::vector <std::string> args;
|
||||
std::string file_override;
|
||||
|
@ -92,6 +95,7 @@ public:
|
|||
std::vector <std::string> tagAdditions;
|
||||
std::vector <std::string> tagRemovals;
|
||||
Hooks hooks;
|
||||
DOM dom;
|
||||
|
||||
std::vector <std::string> headers;
|
||||
std::vector <std::string> footnotes;
|
||||
|
|
96
src/DOM.cpp
Normal file
96
src/DOM.cpp
Normal file
|
@ -0,0 +1,96 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// taskwarrior - a command line task list manager.
|
||||
//
|
||||
// Copyright 2011, Paul Beckingham, Federico Hernandez.
|
||||
// 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
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <DOM.h>
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
DOM::DOM ()
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
DOM::~DOM ()
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
const int DOM::getInteger (const std::string& name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
const double DOM::getReal (const std::string& name)
|
||||
{
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
const bool DOM::getBoolean (const std::string& name)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
const time_t DOM::getDate (const std::string& name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
const std::string DOM::get (const std::string& name)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void DOM::set (const std::string& name, const bool value)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void DOM::set (const std::string& name, const int value)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void DOM::set (const std::string& name, const double value)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void DOM::set (const std::string& name, const time_t value)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void DOM::set (const std::string& name, const std::string& value)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
55
src/DOM.h
Normal file
55
src/DOM.h
Normal file
|
@ -0,0 +1,55 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// taskwarrior - a command line task list manager.
|
||||
//
|
||||
// Copyright 2011, Paul Beckingham, Federico Hernandez.
|
||||
// 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_DOM
|
||||
#define INCLUDED_DOM
|
||||
|
||||
#include <string>
|
||||
#include <time.h>
|
||||
|
||||
class DOM
|
||||
{
|
||||
public:
|
||||
DOM ();
|
||||
~DOM ();
|
||||
|
||||
const int getInteger (const std::string&);
|
||||
const double getReal (const std::string&);
|
||||
const bool getBoolean (const std::string&);
|
||||
const time_t getDate (const std::string&);
|
||||
const std::string get (const std::string&);
|
||||
|
||||
void set (const std::string&, const bool);
|
||||
void set (const std::string&, const int);
|
||||
void set (const std::string&, const double);
|
||||
void set (const std::string&, const time_t);
|
||||
void set (const std::string&, const std::string&);
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
#endif
|
||||
////////////////////////////////////////////////////////////////////////////////
|
1696
src/TDB2.cpp
Normal file
1696
src/TDB2.cpp
Normal file
File diff suppressed because it is too large
Load diff
112
src/TDB2.h
Normal file
112
src/TDB2.h
Normal file
|
@ -0,0 +1,112 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// taskwarrior - a command line task list manager.
|
||||
//
|
||||
// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
|
||||
// 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_TDB2
|
||||
#define INCLUDED_TDB2
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
class TDB2
|
||||
{
|
||||
public:
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
#include "Location.h"
|
||||
#include "Filter.h"
|
||||
#include "Task.h"
|
||||
|
||||
// Length of longest line.
|
||||
#define T_LINE_MAX 32768
|
||||
|
||||
class TDB
|
||||
{
|
||||
public:
|
||||
TDB (); // Default constructor
|
||||
~TDB (); // Destructor
|
||||
|
||||
TDB (const TDB&);
|
||||
TDB& operator= (const TDB&);
|
||||
|
||||
void clear ();
|
||||
void location (const std::string&);
|
||||
|
||||
void lock (bool lockFile = true);
|
||||
void unlock ();
|
||||
|
||||
int load (std::vector <Task>&, Filter&);
|
||||
int loadPending (std::vector <Task>&, Filter&);
|
||||
int loadCompleted (std::vector <Task>&, Filter&);
|
||||
|
||||
const std::vector <Task>& getAllPending ();
|
||||
const std::vector <Task>& getAllNew ();
|
||||
const std::vector <Task>& getAllCompleted ();
|
||||
const std::vector <Task>& getAllModified ();
|
||||
|
||||
void add (const Task&); // Single task add to pending
|
||||
void update (const Task&); // Single task update to pending
|
||||
int commit (); // Write out all tasks
|
||||
int gc (); // Clean up pending
|
||||
int nextId ();
|
||||
void undo ();
|
||||
void merge (const std::string&);
|
||||
|
||||
std::string uuid (int) const;
|
||||
int id (const std::string&) const;
|
||||
|
||||
private:
|
||||
FILE* openAndLock (const std::string&);
|
||||
void writeUndo (const Task&, FILE*);
|
||||
void writeUndo (const Task&, const Task&, FILE*);
|
||||
bool uuidAlreadyUsed (const std::string&);
|
||||
bool uuidAlreadyUsed (const std::string&, const std::vector <Task>&);
|
||||
|
||||
private:
|
||||
std::vector <Location> mLocations;
|
||||
bool mLock;
|
||||
bool mAllOpenAndLocked;
|
||||
int mId;
|
||||
|
||||
std::vector <Task> mPending; // Contents of pending.data
|
||||
std::vector <Task> mCompleted; // Contents of pending.data
|
||||
std::vector <Task> mNew; // Uncommitted new tasks
|
||||
std::vector <Task> mModified; // Uncommitted modified tasks
|
||||
|
||||
std::map <int, std::string> mI2U; // ID -> UUID map
|
||||
std::map <std::string, int> mU2I; // UUID -> ID map
|
||||
};
|
||||
*/
|
||||
|
||||
#endif
|
||||
////////////////////////////////////////////////////////////////////////////////
|
1
test/.gitignore
vendored
1
test/.gitignore
vendored
|
@ -27,6 +27,7 @@ t.benchmark.t
|
|||
t.t
|
||||
taskmod.t
|
||||
tdb.t
|
||||
tdb2.t
|
||||
text.t
|
||||
transport.t
|
||||
tree.t
|
||||
|
|
|
@ -4,6 +4,7 @@ include_directories (${CMAKE_SOURCE_DIR}/src
|
|||
${TASK_INCLUDE_DIRS})
|
||||
|
||||
set (test_SRCS date.t t.t tdb.t duration.t t.benchmark.t text.t autocomplete.t
|
||||
tdb2.t
|
||||
seq.t record.t att.t subst.t nibbler.t filt.t cmd.t config.t
|
||||
util.t color.t list.t path.t file.t grid.t directory.t rx.t
|
||||
taskmod.t rectangle.t tree.t tree2.t uri.t json.t variant.t)
|
||||
|
|
175
test/tdb2.t.cpp
Normal file
175
test/tdb2.t.cpp
Normal file
|
@ -0,0 +1,175 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// taskwarrior - a command line task list manager.
|
||||
//
|
||||
// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
|
||||
// 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
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
#include <iostream>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "test.h"
|
||||
|
||||
Context context;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void get (std::vector <Task>& pending, std::vector <Task>& completed)
|
||||
{
|
||||
TDB tdb;
|
||||
tdb.location (".");
|
||||
tdb.lock ();
|
||||
tdb.loadPending (pending, context.filter);
|
||||
tdb.loadCompleted (completed, context.filter);
|
||||
tdb.unlock ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
int main (int argc, char** argv)
|
||||
{
|
||||
UnitTest t (1);
|
||||
|
||||
try
|
||||
{
|
||||
t.pass ("sample");
|
||||
/*
|
||||
// Remove any residual test file.
|
||||
unlink ("./pending.data");
|
||||
unlink ("./completed.data");
|
||||
unlink ("./undo.data");
|
||||
|
||||
// Set the context to allow GC.
|
||||
context.config.set ("gc", "on");
|
||||
|
||||
// Try reading an empty database.
|
||||
Filter filter;
|
||||
std::vector <Task> all;
|
||||
std::vector <Task> pending;
|
||||
std::vector <Task> completed;
|
||||
get (pending, completed);
|
||||
t.ok (pending.size () == 0, "TDB Read empty pending");
|
||||
t.ok (completed.size () == 0, "TDB Read empty completed");
|
||||
|
||||
// Add without commit.
|
||||
TDB tdb;
|
||||
tdb.location (".");
|
||||
tdb.lock ();
|
||||
Task task ("[name:\"value\"]");
|
||||
tdb.add (task); // P0 C0 N1 M0
|
||||
tdb.unlock ();
|
||||
|
||||
pending.clear ();
|
||||
completed.clear ();
|
||||
get (pending, completed);
|
||||
|
||||
t.ok (pending.size () == 0, "TDB add -> no commit -> empty");
|
||||
t.ok (completed.size () == 0, "TDB add -> no commit -> empty");
|
||||
|
||||
// Add with commit.
|
||||
tdb.lock ();
|
||||
tdb.add (task); // P0 C0 N1 M0
|
||||
tdb.commit (); // P1 C0 N0 M0
|
||||
tdb.unlock ();
|
||||
|
||||
get (pending, completed);
|
||||
t.ok (pending.size () == 1, "TDB add -> commit -> saved");
|
||||
t.is (pending[0].get ("name"), "value", "TDB load name=value");
|
||||
t.is (pending[0].id, 1, "TDB load verification id=1");
|
||||
t.ok (completed.size () == 0, "TDB add -> commit -> saved");
|
||||
|
||||
// Update with commit.
|
||||
pending.clear ();
|
||||
completed.clear ();
|
||||
|
||||
tdb.lock ();
|
||||
tdb.load (all, context.filter);
|
||||
all[0].set ("name", "value2");
|
||||
tdb.update (all[0]); // P1 C0 N0 M1
|
||||
tdb.commit (); // P1 C0 N0 M0
|
||||
tdb.unlock ();
|
||||
|
||||
pending.clear ();
|
||||
completed.clear ();
|
||||
get (pending, completed);
|
||||
|
||||
t.ok (all.size () == 1, "TDB update -> commit -> saved");
|
||||
t.is (all[0].get ("name"), "value2", "TDB load name=value2");
|
||||
t.is (all[0].id, 1, "TDB load verification id=1");
|
||||
|
||||
// GC.
|
||||
all.clear ();
|
||||
|
||||
tdb.lock ();
|
||||
tdb.loadPending (all, context.filter);
|
||||
all[0].setStatus (Task::completed);
|
||||
tdb.update (all[0]); // P1 C0 N0 M1
|
||||
Task t2 ("[foo:\"bar\" status:\"pending\"]");
|
||||
tdb.add (t2); // P1 C0 N1 M1
|
||||
tdb.commit ();
|
||||
tdb.unlock ();
|
||||
|
||||
pending.clear ();
|
||||
completed.clear ();
|
||||
get (pending, completed);
|
||||
|
||||
t.is (pending.size (), (size_t)2, "TDB before gc pending #2");
|
||||
t.is (pending[0].id, 1, "TDB before gc pending id 1");
|
||||
t.is (pending[0].getStatus (), Task::completed, "TDB before gc pending status completed");
|
||||
t.is (pending[1].id, 2, "TDB before gc pending id 2");
|
||||
t.is (pending[1].getStatus (), Task::pending, "TDB before gc pending status pending");
|
||||
t.is (completed.size (), (size_t)0, "TDB before gc completed 0");
|
||||
|
||||
tdb.gc (); // P1 C1 N0 M0
|
||||
|
||||
pending.clear ();
|
||||
completed.clear ();
|
||||
get (pending, completed);
|
||||
|
||||
t.is (pending.size (), (size_t)1, "TDB after gc pending #1");
|
||||
t.is (pending[0].id, 1, "TDB after gc pending id 2");
|
||||
t.is (pending[0].getStatus (), Task::pending, "TDB after gc pending status pending");
|
||||
t.is (completed.size (), (size_t)1, "TDB after gc completed #1");
|
||||
t.is (completed[0].getStatus (), Task::completed, "TDB after gc completed status completed");
|
||||
*/
|
||||
}
|
||||
|
||||
catch (std::string& error)
|
||||
{
|
||||
t.diag (error);
|
||||
return -1;
|
||||
}
|
||||
|
||||
catch (...)
|
||||
{
|
||||
t.diag ("Unknown error.");
|
||||
return -2;
|
||||
}
|
||||
|
||||
unlink ("./pending.data");
|
||||
unlink ("./completed.data");
|
||||
unlink ("./undo.data");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue