From d62ea4e223fac184c980418240ece2c13f46f1bb Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 2 Oct 2011 17:33:36 -0400 Subject: [PATCH] Synch - Added server configuration test to synch command. --- src/commands/CmdSynch.cpp | 13 +++++++++---- src/en-US.h | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/commands/CmdSynch.cpp b/src/commands/CmdSynch.cpp index 324ae0fc0..9d41a6859 100644 --- a/src/commands/CmdSynch.cpp +++ b/src/commands/CmdSynch.cpp @@ -50,13 +50,18 @@ int CmdSynch::execute (std::string& output) { // TODO Tempporary. std::cout << "\n" - << "Task Server Synchronization is not implemented in 2.0.0beta1.\n" + << "Task Server Synchronization is not implemented in 2.0.0beta3.\n" << "\n"; - // TODO If no server is set up - // throw std::string ("Task server is not configured."); + // 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); + + // Obtain credentials. + std::string credentials = context.config.get ("taskd.credentials"); - // TODO Obtain credentials. // TODO Obtain synch key. // TODO Compose backlog into ticket. diff --git a/src/en-US.h b/src/en-US.h index b10a2e2c5..b097cc5b4 100644 --- a/src/en-US.h +++ b/src/en-US.h @@ -334,7 +334,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 "(Not implemented for 2.0.0beta2)" +#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_DIAG_USAGE "Shows information needed when reporting a problem" #define STRING_CMD_DIAG_PLATFORM "Platform" #define STRING_CMD_DIAG_UNKNOWN ""