diff --git a/ChangeLog.230 b/ChangeLog.230 index e69de29bb..01a129b85 100644 --- a/ChangeLog.230 +++ b/ChangeLog.230 @@ -0,0 +1,11 @@ +------ current release --------------------------- + +2.3.0 () - + +Features + + + +Bugs + + + +------ old releases ------------------------------ diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index 166f1a566..86588648a 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -46,7 +46,7 @@ set (commands_SRCS Command.cpp Command.h CmdStatistics.cpp CmdStatistics.h CmdStop.cpp CmdStop.h CmdSummary.cpp CmdSummary.h - CmdSynch.cpp CmdSynch.h + CmdSync.cpp CmdSync.h CmdTags.cpp CmdTags.h CmdTimesheet.cpp CmdTimesheet.h CmdUDAs.cpp CmdUDAs.h diff --git a/src/commands/CmdStatistics.cpp b/src/commands/CmdStatistics.cpp index daa23801f..6a511bf09 100644 --- a/src/commands/CmdStatistics.cpp +++ b/src/commands/CmdStatistics.cpp @@ -273,10 +273,10 @@ int CmdStatistics::execute (std::string& output) } /* - // TODO Re-enable this when 2.1 has taskd support. Until then, it makes no + // TODO Re-enable this when 2.3 has taskd support. Until then, it makes no // sense to include this. row = view.addRow (); - view.set (row, 0, STRING_CMD_STATS_LAST_SYNCH); + view.set (row, 0, STRING_CMD_STATS_LAST_SYNC); if (context.tdb2.synch_key._file.exists ()) view.set (row, 1, Date (context.tdb2.synch_key._file.mtime ()).toISO ()); else diff --git a/src/commands/CmdSynch.cpp b/src/commands/CmdSync.cpp similarity index 80% rename from src/commands/CmdSynch.cpp rename to src/commands/CmdSync.cpp index fca3b5fab..ac4f7b693 100644 --- a/src/commands/CmdSynch.cpp +++ b/src/commands/CmdSync.cpp @@ -31,48 +31,39 @@ #include #include #include -#include +#include extern Context context; //////////////////////////////////////////////////////////////////////////////// -CmdSynch::CmdSynch () +CmdSync::CmdSync () { _keyword = "synchronize"; _usage = "task synchronize"; - _description = STRING_CMD_SYNCH_USAGE; + _description = STRING_CMD_SYNC_USAGE; _read_only = false; _displays_id = true; } //////////////////////////////////////////////////////////////////////////////// -int CmdSynch::execute (std::string& output) +int CmdSync::execute (std::string& output) { - // TODO Tempporary. - std::cout << "\n" - << "Task Server Synchronization is not implemented in 2.0.0beta3.\n" - << "\n"; - // If no server is set up, quit. std::string connection = context.config.get ("taskd.server"); if (connection == "" || connection.find (':') == std::string::npos) - throw std::string (STRING_CMD_SYNCH_NO_SERVER); + throw std::string (STRING_CMD_SYNC_NO_SERVER); // Obtain credentials. std::string credentials = context.config.get ("taskd.credentials"); - // TODO Obtain synch key. + // TODO Read backlog.data. + // TODO Send backlog.data in 'sync' request.. - // TODO Compose backlog into ticket. - // TODO Request synch. - - // TODO Receive synch data. - // TODO Extract remote mods. - // TODO Extract new synch key. - // TODO Apply remote mods. + // TODO Receive response. + // TODO Apply tasks. + // TODO Truncate backlog.data. // TODO Store new synch key. - // TODO Truncate backlog. return 1; } diff --git a/src/commands/CmdSynch.h b/src/commands/CmdSync.h similarity index 94% rename from src/commands/CmdSynch.h rename to src/commands/CmdSync.h index 52b86ba94..ed5925afd 100644 --- a/src/commands/CmdSynch.h +++ b/src/commands/CmdSync.h @@ -25,17 +25,17 @@ // //////////////////////////////////////////////////////////////////////////////// -#ifndef INCLUDED_CMDSYNCH -#define INCLUDED_CMDSYNCH +#ifndef INCLUDED_CMDSYNC +#define INCLUDED_CMDSYNC #define L10N // Localization complete. #include #include -class CmdSynch : public Command +class CmdSync : public Command { public: - CmdSynch (); + CmdSync (); int execute (std::string&); }; diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index 28b665abf..e11b58aba 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -83,7 +83,7 @@ #include #include #include -//#include +#include #include #include #include @@ -158,7 +158,7 @@ void Command::factory (std::map & all) c = new CmdStatistics (); all[c->keyword ()] = c; c = new CmdStop (); all[c->keyword ()] = c; c = new CmdSummary (); all[c->keyword ()] = c; -// c = new CmdSynch (); all[c->keyword ()] = c; + c = new CmdSync (); all[c->keyword ()] = c; c = new CmdTags (); all[c->keyword ()] = c; c = new CmdTimesheet (); all[c->keyword ()] = c; c = new CmdUDAs (); all[c->keyword ()] = c; diff --git a/src/en-US.h b/src/en-US.h index a13cf0668..f474ced3a 100644 --- a/src/en-US.h +++ b/src/en-US.h @@ -259,7 +259,7 @@ #define STRING_CMD_STATS_AVG_PEND "Average time pending" #define STRING_CMD_STATS_DESC_LEN "Average desc length" #define STRING_CMD_STATS_CHARS "{1} characters" -#define STRING_CMD_STATS_LAST_SYNCH "Last server synchronization" +#define STRING_CMD_STATS_LAST_SYNC "Last server synchronization" #define STRING_CMD_STATS_BLOCKED "Blocked tasks" #define STRING_CMD_STATS_BLOCKING "Blocking tasks" #define STRING_CMD_REPORTS_USAGE "Lists all supported reports" @@ -409,8 +409,8 @@ #define STRING_CMD_SHELL_HELP1 "Enter any task command (such as 'list'), or hit 'Enter'." #define STRING_CMD_SHELL_HELP2 "There is no need to include the 'task' command itself." #define STRING_CMD_SHELL_HELP3 "Enter 'quit' (or 'bye', 'exit') to end the session." -#define STRING_CMD_SYNCH_USAGE "Synchronizes data with the Task Server" -#define STRING_CMD_SYNCH_NO_SERVER "Task Server is not configured." +#define STRING_CMD_SYNC_USAGE "Synchronizes data with the Task Server" +#define STRING_CMD_SYNC_NO_SERVER "Task Server is not configured." #define STRING_CMD_DIAG_USAGE "Platform, build and environment details" #define STRING_CMD_DIAG_PLATFORM "Platform" #define STRING_CMD_DIAG_UNKNOWN ""