Merge branch 'us18-cli-output' into 'develop'

US18: Adjust CLI Output

See merge request tobias.wach/ccats!25

cli/include/cmdman.h

@@ -22,27 +22,35 @@ using std::vector;
 class CmdMan {
 public:
   /**
-   * Type of message returned in CmdRet.
-   * notsend	- do not send anything to the server
-   * send		- send something to the server
+   * Flags for type of message returned in CmdRet.
+   * print	- print something to the user
+   * send	- send something to the server
    * error	- an error occured, do not send to the server
    * close	- terminate the connection
    * seton	- contextually change state, used for version check and login
    */
-  enum rettype { notsend, send, error, close, seton };
+  enum rettype {
+    print = (1 << 0),
+    send = (1 << 1),
+    error = (1 << 2),
+    close = (1 << 3),
+    seton = (1 << 4)
+  };
   /**
    * Response to user or command input
    *
-   * string is to be handled depending on type
+   * msg is to be handled depending on type
+   * if nextcommand isnt an empty string it should be handled;
    */
   struct CmdRet {
-    rettype type;
-    string msg;
+    unsigned int type;
+    string nextcommand;
+    Json::Value msg;
   };
   /**
    * Constructor and destructor
    */
-  CmdMan(FileMan &fm);
+  CmdMan(FileMan &fm, void (*dpf)(string));
   ~CmdMan();
 
   /**
@@ -71,6 +79,8 @@ private:
    */
   FileMan &fileman;
 
+  void (*debugprintfunc)(string);
+
   /**
    * Maps containing pointers to the appropriate member functions for executing
    * or handling commands

cli/include/fileman.h

@@ -19,7 +19,7 @@ private:
    *
    * Filestreams for put and get
    * Vector for holding received filenames from listing
-   * Names for put and get
+   * Paths and filenames for put and get
    * Size for internal read
    * Total and Remaining chunks for put, get and list
    * Boolean replacement for filestreams being open for list
@@ -28,7 +28,7 @@ private:
   std::ifstream putfile;
   std::ofstream getfile;
   std::vector<std::string> listdata;
-  std::string getname, putname;
+  std::string getpath, getname, putpath, putname;
   const unsigned int max_read_len = 8;
   int putsize;
   int putchunks;
@@ -61,8 +61,8 @@ public:
    *
    * Return true if successful, false otherwise
    */
-  bool openPut(const std::string &name);
-  bool openGet(const std::string &name);
+  bool openPut(const std::string &path);
+  bool openGet(const std::string &path);
   bool openList();
 
   /**
@@ -125,6 +125,11 @@ public:
    */
   void setGetChunks(int chunks);
   void setListChunks(int chunks);
+
+  /**
+   * Returns the filename of the passed (relative) path of a file
+   */
+  std::string pathToFilename(std::string path);
 };
 
 #endif

cli/include/ioman.h

@@ -6,6 +6,7 @@
 
 #include <boost/asio.hpp>
 #include <condition_variable>
+#include <json/json.h>
 #include <mutex>
 #include <string>
 #include <thread>
@@ -61,7 +62,7 @@ private:
    * Flag telling wether one is connected
    */
   std::string ipstring;
-  int port;
+  unsigned short port;
   bool connected;
   /**
    * Instances of CmdMan and FileMan to process user input and handle File I/O
@@ -108,12 +109,14 @@ private:
   std::mutex initmutex;
   std::condition_variable initcv;
 
-protected:
   /**
-   * mutex
+   * Tokenizes input based on space as seperator
+   * Respects double-quoted tokens
+   * Returns a vector with the tokens as elements in order
    */
-  std::mutex msgmutex;
+  std::vector<std::string> tokenizeInput(std::string in);
 
+protected:
   /**
    * Prompt messages for readline prompt
    */
@@ -127,7 +130,7 @@ public:
    * Constructor and destructor
    */
   IoMan(char *ipcstring);
-  ~IoMan();
+  virtual ~IoMan();
 
   /**
    * Establish connection to server and perform vesion check

cli/include/machineioman.h

@@ -13,6 +13,7 @@ class MachineIoMan : public IoMan {
 public:
   using IoMan::IoMan;
 
+protected:
   /**
    * Specific implementations for printing messages
    */

cli/include/userioman.h

@@ -10,9 +10,55 @@
  * for interactive user sessions
  */
 class UserIoMan : public IoMan {
+private:
+  /**
+   * Map containing pointers to the appropriate member functions for printing
+   * formatted json output
+   */
+  map<string, void (UserIoMan::*)(Json::Value)> printmap;
+
+  /**
+   * Class-wide json functionality
+   */
+  Json::CharReader *reader;
+  Json::StreamWriterBuilder wbuilder;
+  string jsonerror;
+
+  /**
+   * Format and pretty print json for terminal output
+   */
+  void printJson(Json::Value root);
+
+  /**
+   * Method prototypes for printing json output
+   */
+  /* printing commands go here */
+  void printConnect(Json::Value root);
+  void printHelp(Json::Value root);
+  void printStatus(Json::Value root);
+  void printDisconnect(Json::Value root);
+  void printPut(Json::Value root);
+  void printGet(Json::Value root);
+  void printList(Json::Value root);
+  void printVersion(Json::Value root);
+  void printLogin(Json::Value root);
+  void printPutdata(Json::Value root);
+  void printGetdata(Json::Value root);
+  void printListdata(Json::Value root);
+
+  /**
+   * Mutex for synchronized message output
+   */
+  std::recursive_mutex msgmutex;
+
 public:
-  using IoMan::IoMan;
+  /**
+   * Constructor and destructor
+   */
+  UserIoMan(char *ipcstring);
+  ~UserIoMan();
 
+protected:
   /**
    * Specific implementations for printing messages
    */

cli/src/cmdman.cpp

@@ -3,7 +3,11 @@
 
 #include <iostream>
 
-CmdMan::CmdMan(FileMan &fm) : fileman(fm) {
+#define DEBUGPRINT(x) debugprintfunc(x)
+//~ #define DEBUGPRINT(x) std::cerr << x
+//~ #define DEBUGPRINT(x)
+
+CmdMan::CmdMan(FileMan &fm, void (*dpf)(string)) : fileman(fm) {
 
   /* setup json stuff */
   Json::CharReaderBuilder rbuilder;
@@ -43,70 +47,74 @@ CmdMan::CmdMan(FileMan &fm) : fileman(fm) {
   handlemap["list"] = &CmdMan::handleList;
   handlemap["version"] = &CmdMan::handleVersion;
   handlemap["login"] = &CmdMan::handleLogin;
+
+  debugprintfunc = dpf;
 }
 
 CmdMan::~CmdMan() { delete reader; }
 
 CmdMan::CmdRet CmdMan::cmdHelp(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value root, arr;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   map<string, string>::iterator it;
+  root["command"] = "help";
   for (it = helpmap.begin(); it != helpmap.end(); it++) {
-    retval.msg.append(it->first);
-    retval.msg.append(" - ");
-    retval.msg.append(it->second);
-    retval.msg.append("\n");
+    arr.append(it->first + " - " + it->second);
   }
-  retval.type = notsend;
+  root["names"] = arr;
+  retval.type = print;
+  retval.msg = root;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdStatus(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
   root["command"] = "status";
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdDisconnect(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
   root["command"] = "close";
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdPut(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
 
   bool opened = fileman.openPut(args[0]);
+  root["command"] = "put";
+  root["file"] = fileman.getPutName();
   if (opened) {
-    root["command"] = "put";
-    root["file"] = fileman.getPutName();
     root["size"] = fileman.getPutSize();
     root["chunks"] = fileman.getPutChunks();
     retval.type = send;
-    retval.msg = Json::writeString(wbuilder, root);
   } else {
     retval.type = error;
-    retval.msg = "couldnt open local file \"" + args[0] + "\"";
+    root["accept"] = false;
+    root["error"] = "couldnt open local file \"" + args[0] + "\"";
   }
 
+  retval.msg = root;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdPutdata(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
 
   root["command"] = "putdata";
@@ -117,33 +125,34 @@ CmdMan::CmdRet CmdMan::cmdPutdata(vector<string> args) {
       fileman
           .getPutRemainingChunks(); // number already decremented by readBase64
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdGet(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
 
   bool opened = fileman.openGet(args[0]);
+  root["command"] = "get";
+  root["file"] = fileman.getGetName();
   if (opened) {
-    root["command"] = "get";
-    root["file"] = fileman.getGetName();
     retval.type = send;
-    retval.msg = Json::writeString(wbuilder, root);
   } else {
     retval.type = error;
-    retval.msg = "local file \"" + args[0] + "\" already exists";
+    root["accept"] = false;
+    root["error"] = "local file \"" + args[0] + "\" already exists";
   }
 
+  retval.msg = root;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdGetdata(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
 
   root["command"] = "getdata";
@@ -151,49 +160,51 @@ CmdMan::CmdRet CmdMan::cmdGetdata(vector<string> args) {
   root["chunk"] = fileman.getGetRemainingChunks();
   root["cancel"] = false;
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdList(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
 
   bool opened = fileman.openList();
+  root["command"] = "list";
   if (opened) {
-    root["command"] = "list";
     retval.type = send;
-    retval.msg = Json::writeString(wbuilder, root);
   } else {
     retval.type = error;
-    retval.msg = "cannot list, already listing";
+    root["accept"] = false;
+    root["names"] = "";
+    root["error"] = "cannot list, already listing";
   }
 
+  retval.msg = root;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::cmdListdata(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
   root["command"] = "listdata";
   root["chunk"] = fileman.getListRemainingChunks();
   root["cancel"] = false;
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::execute(string cmd, vector<string> args) {
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
-  std::cerr << __PRETTY_FUNCTION__ << " using command \"" << cmd
-            << "\" with arguments [ ";
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " using command \"" + cmd +
+             "\" with arguments [ ");
   for (string s : args)
-    std::cerr << s << " ";
-  std::cerr << "]" << std::endl;
+    DEBUGPRINT(s + " ");
+  DEBUGPRINT("]\n");
   map<string, CmdRet (CmdMan::*)(vector<string>)>::iterator it =
       execmap.find(cmd);
   string retmsg;
@@ -207,11 +218,11 @@ CmdMan::CmdRet CmdMan::execute(string cmd, vector<string> args) {
 /* internal commands */
 CmdMan::CmdRet CmdMan::cmdVersion(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
   root["version"] = protocolVersion;
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   doversion = true;
 
@@ -220,14 +231,14 @@ CmdMan::CmdRet CmdMan::cmdVersion(vector<string> args) {
 
 CmdMan::CmdRet CmdMan::cmdLogin(vector<string> args) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   Json::Value root;
   root["user"] = args[0];
   root["pass"] = args[1];
   root["login"] = true;
   root["cancel"] = false;
   retval.type = send;
-  retval.msg = Json::writeString(wbuilder, root);
+  retval.msg = root;
 
   dologin = true;
 
@@ -245,13 +256,13 @@ CmdMan::CmdRet CmdMan::cmdLogin(vector<string> args) {
 */
 
 CmdMan::CmdRet CmdMan::handle(Json::Value root) {
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   if (doversion)
     root["command"] = "version";
   else if (dologin)
     root["command"] = "login";
-  std::cerr << __PRETTY_FUNCTION__ << " using json" << std::endl
-            << root << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " using json\n" +
+             Json::writeString(wbuilder, root) + "\n");
   string retmsg;
   map<string, CmdRet (CmdMan::*)(Json::Value)>::iterator it =
       handlemap.find(root["command"].asString());
@@ -265,231 +276,277 @@ CmdMan::CmdRet CmdMan::handle(Json::Value root) {
 
 CmdMan::CmdRet CmdMan::handleStatus(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
-  retval.type = notsend;
-  retval.msg = root["response"].asString();
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+  retval.type = print;
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleClose(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   retval.type = close;
-  retval.msg = root["response"].asString();
+  retval.msg = root;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handlePut(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output;
+  output["command"] = "put";
+  output["file"] = fileman.getPutName();
+  output["accept"] = false;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
 
   if (!root["accept"].asBool()) {
     retval.type = error;
-    retval.msg = "File upload request failed: Server reports: " +
-                 root["error"].asString();
+    output["error"] = "Server reports: " + root["error"].asString();
+    fileman.cancelPut();
   } else if (root["file"].asString() != fileman.getPutName()) {
     retval.type = error;
-    retval.msg = "File upload request failed: Server reports filename " +
-                 root["file"].asString() + " but actual filename is " +
-                 fileman.getPutName();
+    output["error"] = "Server reports filename " + root["file"].asString() +
+                      " but actual filename is " + fileman.getPutName();
+    fileman.cancelPut();
   } else {
-    retval.type = send;
-    retval.msg = "putdata";
+    output["accept"] = true;
+    output["error"] = "";
+    retval.type = print | send;
+    retval.nextcommand = "putdata";
   }
+  retval.msg = output;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handlePutdata(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+  output["command"] = "putdata";
+  output["file"] = fileman.getPutName();
+  output["speed"] = 0.0f; // TODO
+  output["cancel"] = true;
 
   if (root["received"].asInt() != fileman.getPutRemainingChunks()) {
     // the number of remaining chunks received from the daemon does not equal
     // the number stored at the client side
     retval.type = error;
-    retval.msg = std::string("File upload failed: Server reports number of "
-                             "remaining chunks as ") +
-                 std::to_string(root["received"].asInt()) +
-                 " but actual number is " +
-                 std::to_string(fileman.getPutRemainingChunks());
+    output["error"] = std::string("Server reports number of "
+                                  "remaining chunks as ") +
+                      std::to_string(root["received"].asInt()) +
+                      " but actual number is " +
+                      std::to_string(fileman.getPutRemainingChunks());
     fileman.cancelPut();
   } else if (root["cancel"].asBool()) {
     retval.type = error;
-    retval.msg =
-        "File upload cancelles: Server reports: " + root["error"].asString();
+    output["error"] = "Server reports: " + root["error"].asString();
     fileman.cancelPut();
   } else if (root["file"].asString() != fileman.getPutName()) {
     retval.type = error;
-    retval.msg = "File upload request failed: Server reports filename " +
-                 root["file"].asString() + " but actual filename is " +
-                 fileman.getPutName();
+    output["error"] = "Server reports filename " + root["file"].asString() +
+                      " but actual filename is " + fileman.getPutName();
     fileman.cancelPut();
   } else {
+    output["cancel"] = false;
+    output["error"] = "";
     // sent successfully
     if (!root["received"].asInt()) {
       // everything sent
-      retval.type = notsend;
-      retval.msg = "succesfully uploaded file " + fileman.getPutName();
+      retval.type = print;
+      // TODO
+      //~ retval.msg = "succesfully uploaded file " + fileman.getPutName();
       fileman.closePut();
     } else {
-      retval.type = send;
-      retval.msg = "putdata";
+      retval.type = print | send;
+      retval.nextcommand = "putdata";
     }
   }
+  retval.msg = output;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleGet(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output;
+  output["command"] = "get";
+  output["file"] = fileman.getGetName();
+  output["accept"] = false;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
 
   if (!root["accept"].asBool()) {
     retval.type = error;
-    retval.msg = "File download request failed: Server reports: " +
-                 root["error"].asString();
+    output["error"] = "Server reports: " + root["error"].asString();
   } else if (root["file"].asString() != fileman.getGetName()) {
     retval.type = error;
-    retval.msg = "File download request failed: Server reports filename " +
-                 root["file"].asString() + " but actual filename is " +
-                 fileman.getGetName();
+    output["error"] = "Server reports filename " + root["file"].asString() +
+                      " but actual filename is " + fileman.getGetName();
   } else {
     fileman.setGetChunks(root["chunks"].asInt());
-    retval.type = send;
-    retval.msg = "getdata";
+    output["accept"] = true;
+    output["error"] = "";
+    retval.type = print | send;
+    retval.nextcommand = "getdata";
   }
+  retval.msg = output;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleGetdata(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+  output["command"] = "getdata";
+  output["file"] = fileman.getGetName();
+  output["speed"] = 0.0f; // TODO
+  output["cancel"] = true;
 
   // the passed number of recieved chunks should equal the number of sent chunks
   if (root["remaining"].asInt() != fileman.getGetRemainingChunks()) {
     retval.type = error;
-    retval.msg = std::string("File download failed: Server reports number of "
-                             "remaining chunks as ") +
-                 std::to_string(root["remaining"].asInt()) +
-                 " but actual number is " +
-                 std::to_string(fileman.getGetRemainingChunks());
+    output["error"] =
+        std::string("Server reports number of remaining chunks as ") +
+        std::to_string(root["remaining"].asInt()) + " but actual number is " +
+        std::to_string(fileman.getGetRemainingChunks());
     fileman.cancelGet();
   } else if (root["cancel"].asBool()) {
     retval.type = error;
-    retval.msg =
-        "File download cancelled: Server reports: " + root["error"].asString();
+    output["error"] = "Server reports: " + root["error"].asString();
     fileman.cancelGet();
   } else if (root["file"].asString() != fileman.getGetName()) {
     retval.type = error;
-    retval.msg = "File download failed: Server reports filename " +
-                 root["file"].asString() + " but actual filename is " +
-                 fileman.getGetName();
+    output["error"] = "Server reports filename " + root["file"].asString() +
+                      " but actual filename is " + fileman.getGetName();
     fileman.cancelGet();
   } else {
+    output["cancel"] = false;
+    output["error"] = "";
     fileman.writeBase64(root["data"].asString());
     // loaded successfully
     if (fileman.getGetRemainingChunks() < 0) {
       // everything sent
-      retval.type = notsend;
-      retval.msg = "succesfully downloaded file " + fileman.getGetName();
+      retval.type = print;
+      //~ retval.msg = "succesfully downloaded file " + fileman.getGetName();
       fileman.closeGet();
     } else {
-      retval.type = send;
-      retval.msg = "getdata";
+      retval.type = print | send;
+      retval.nextcommand = "getdata";
     }
   }
+  retval.msg = output;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleList(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output; // LOCALOUTPUT
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+
+  output["command"] = "list";
+  output["names"] = "";
 
   if (!root["accept"].asBool()) {
     retval.type = error;
-    retval.msg = "File listing request failed: Server reports: " +
-                 root["error"].asString();
+    output["accept"] = false;
+    output["error"] = "Server reports: " + root["error"].asString();
+    fileman.cancelList();
   } else {
     fileman.setListChunks(root["chunks"].asInt());
     retval.type = send;
-    retval.msg = "listdata";
+    output["accept"] = true;
+    retval.nextcommand = "listdata";
   }
 
+  retval.msg = output;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleListdata(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output, arr;
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
   vector<string> toadd;
 
+  output["command"] = "list";
+  output["names"] = "";
+  output["accept"] = false;
   // the passed number of recieved chunks should equal the number of sent chunks
   if (root["remaining"].asInt() != fileman.getListRemainingChunks()) {
     retval.type = error;
-    retval.msg = std::string("File listing failed: Server reports number of "
-                             "remaining chunks as ") +
-                 std::to_string(root["remaining"].asInt()) +
-                 " but actual number is " +
-                 std::to_string(fileman.getListRemainingChunks());
+    output["error"] = std::string("Server reports number of "
+                                  "remaining chunks as ") +
+                      std::to_string(root["remaining"].asInt()) +
+                      " but actual number is " +
+                      std::to_string(fileman.getListRemainingChunks());
     fileman.cancelList();
   } else if (root["cancel"].asBool()) {
     retval.type = error;
-    retval.msg =
-        "File listing cancelled: Server reports: " + root["error"].asString();
+    output["error"] = "Server reports: " + root["error"].asString();
     fileman.cancelList();
   } else {
+    output["accept"] = true;
     for (Json::Value i : root["names"])
       toadd.push_back(i.asString());
     fileman.putListData(toadd);
     // loaded successfully
     if (!fileman.getListRemainingChunks()) {
       // everything sent
-      retval.type = notsend;
-      retval.msg = "Files on server:\n";
+      retval.type = print;
       for (string s : fileman.getListData())
-        retval.msg += s + "\n";
+        arr.append(s);
+      output["names"] = arr;
       fileman.closeList();
     } else {
-      retval.type = send;
-      retval.msg = "listdata";
+      retval.type = print | send;
+      retval.nextcommand = "listdata";
     }
   }
+  retval.msg = output;
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleVersion(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output; // LOCALOUTPUT
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+
+  output["command"] = "version";
+  output["serverversion"] = root["version"].asString();
+  output["clientversion"] = protocolVersion;
 
   if (!root["accept"].asBool()) {
     retval.type = error;
-    retval.msg = "Version check failed: Server reports " +
-                 root["version"].asString() + " but client is version " +
-                 protocolVersion;
+    output["accept"] = false;
   } else {
-    retval.type = seton;
-    retval.msg = "Version check ok.";
+    retval.type = print | seton;
+    output["accept"] = true;
     doversion = false;
   }
+  retval.msg = output;
 
   return retval;
 }
 
 CmdMan::CmdRet CmdMan::handleLogin(Json::Value root) {
   CmdRet retval;
-  std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+  Json::Value output; // LOCALOUTPUT
+  DEBUGPRINT(string(__PRETTY_FUNCTION__) + " begin");
+
+  output["command"] = "login";
 
   if (!root["accept"].asBool()) {
     retval.type = error;
-    retval.msg = "Login failed: " + root["error"].asString();
+    output["error"] = root["error"].asString();
+    output["accept"] = false;
   } else {
-    retval.type = seton;
-    retval.msg = "Login ok.";
+    retval.type = print | seton;
+    output["error"] = "";
+    output["accept"] = true;
     dologin = false;
   }
+  retval.msg = output;
 
   return retval;
 }

cli/src/fileman.cpp

@@ -15,9 +15,10 @@ bool FileMan::isPutting() { return putfile.is_open(); }
 
 bool FileMan::isListing() { return islisting; }
 
-bool FileMan::openPut(const std::string &name) {
-  putname = name;
-  putfile.open(name, std::ios::ate | std::ios::binary);
+bool FileMan::openPut(const std::string &path) {
+  putpath = path;
+  putname = pathToFilename(path);
+  putfile.open(path, std::ios::ate | std::ios::binary);
   if (putfile.is_open()) {
     size_t size = putfile.tellg();
     putsize = size;
@@ -29,11 +30,12 @@ bool FileMan::openPut(const std::string &name) {
   return false;
 }
 
-bool FileMan::openGet(const std::string &name) {
-  getname = name;
+bool FileMan::openGet(const std::string &path) {
+  getpath = path;
+  getname = pathToFilename(path);
   getchunks = 0;
   getchunksRemaining = 0;
-  getfile.open(name, std::ios::app | std::ios::binary);
+  getfile.open(path, std::ios::app | std::ios::binary);
   if (getfile.tellp() != std::ios::beg) {
     closeGet();
     return false;
@@ -137,3 +139,29 @@ int FileMan::getPutSize() { return putsize; }
 int FileMan::getListRemainingChunks() { return listchunksRemaining; }
 
 int FileMan::getListChunks() { return listchunks; }
+
+std::string FileMan::pathToFilename(std::string path) {
+
+  int lastFoundIndex = -1;
+
+  for (int currentIndex = path.find("/"); currentIndex != std::string::npos;
+       currentIndex = path.find("/", currentIndex + 1)) {
+
+    // check if the "/" was escaped
+    if (currentIndex > 0 && path[currentIndex - 1] == '\\')
+      continue;
+
+    /*  // check unnecessary, because error occurs when trying to open file
+       anyways
+
+        // check if the "/" is at the end of path name
+        if (currentIndex + 1 == path.length()) {
+          // ERROR: INVALID FILENAME, BECAUSE ENDS WITH "/"
+        }
+    */
+    // otherwise we found a valid "/"
+    lastFoundIndex = currentIndex;
+  }
+
+  return path.substr(lastFoundIndex + 1);
+}

cli/src/ioman.cpp

@@ -17,12 +17,17 @@ using std::string;
 using std::vector;
 
 using boost::asio::buffer;
+using boost::asio::ip::address;
 using boost::asio::ip::tcp;
 
 /* this will be provided by main.cpp for the readline callback */
 extern IoMan *gIOMAN;
 
-IoMan::IoMan(char *ipcstring) : cmdman(fileman) {
+void ioman_externalDebugPrint(string msg) {
+  gIOMAN->printMessage(msg, gIOMAN->OutMsgType::debug);
+}
+
+IoMan::IoMan(char *ipcstring) : cmdman(fileman, &ioman_externalDebugPrint) {
   ipstring = std::string(ipcstring);
   port = 1234;
   tcpsock = new tcp::socket(ios);
@@ -42,23 +47,27 @@ IoMan::IoMan(char *ipcstring) : cmdman(fileman) {
 }
 
 IoMan::~IoMan() {
-  networkmutex.lock();
-  inputmutex.lock();
-  responsemutex.lock();
-  runnetwork = false;
-  runinput = false;
-  runresponse = false;
-  networkmutex.unlock();
-  inputmutex.unlock();
-  responsemutex.unlock();
-
   initcv.notify_all();
-  localcv.notify_all();
-  netcv.notify_all();
-
-  tnetwork.join();
-  tinput.join();
-  tresponse.join();
+  if (runnetwork) {
+    networkmutex.lock();
+    runnetwork = false;
+    networkmutex.unlock();
+    tnetwork.join();
+  }
+  if (runinput) {
+    inputmutex.lock();
+    runinput = false;
+    inputmutex.unlock();
+    localcv.notify_all();
+    tinput.join();
+  }
+  if (runresponse) {
+    responsemutex.lock();
+    runresponse = false;
+    responsemutex.unlock();
+    netcv.notify_all();
+    tresponse.join();
+  }
 
   if (connected) {
     disconnect();
@@ -70,24 +79,89 @@ IoMan::~IoMan() {
 
 void IoMan::printMessage(string nouse, OutMsgType nouse2) {}
 
-bool IoMan::connect() {
-  tcp::endpoint *ep;
+vector<string> IoMan::tokenizeInput(string in) {
+  size_t prev, index, quot;
+  vector<string> args;
+  /* tokenize string into command and arguments vector*/
+  if ((index = in.find(" ")) == string::npos) {
+    // only command no args
+    args.push_back(in);
+  } else {
+    args.push_back(in.substr(0, index));
+    index++;
+
+    bool end_tokenizing = false;
+    while (!end_tokenizing) {
+      // find first char thats not a space
+      while (in[index] == ' ') {
+        index++;
+
+        // bounds check
+        if (index == in.size())
+          end_tokenizing = true;
+      }
+      if (end_tokenizing)
+        break;
+
+      in = in.substr(index);
+
+      if (in[0] == '\"') {
+        // quoted string
+        in = in.substr(1);
+        index = in.find("\"");
+        args.push_back(in.substr(0, index));
+        index++;
 
-  ep = new tcp::endpoint(boost::asio::ip::address::from_string(ipstring), 1234);
+        /*
+        tokens.push_back(in.substr(0, ++index));
+        */
 
-  // establish connection
-  printMessage("IoMan::connect() connecting to " + ipstring, debug);
-  tcpsock->connect(*ep, errcode);
+        // char after closing quote should be space while within bounds
+        if (index == in.size())
+          end_tokenizing = true;
+      } else {
+        // non-quoted string
+        index = in.find(" ");
+        if (index == string::npos) { // no spaces, last arg
+          args.push_back(in);
+          end_tokenizing = true;
+        } else {
+          args.push_back(in.substr(0, index));
+        }
+      }
+    }
+  }
+  return args;
+}
+
+bool IoMan::connect() {
+  tcp::endpoint *ep = NULL;
+  address addr;
+  Json::Value root;
+  root["command"] = "connect";
+  root["address"] = ipstring;
+  root["port"] = port;
+  addr = address::from_string(ipstring, errcode);
   if (errcode) {
+    root["error"] = errcode.message();
+    connected = false;
+  } else {
+    // establish connection
+    printMessage("IoMan::connect() connecting to " + ipstring, debug);
+    ep = new tcp::endpoint(addr, port);
+    tcpsock->connect(*ep, errcode);
+    if (errcode) {
+      root["error"] = errcode.message();
+      connected = false;
+    } else {
+      connected = true;
+      root["error"] = "";
+    }
     delete ep;
-    printMessage("IoMan::connect() couldnt connect to " + ipstring + "\n" +
-                     errcode.message(),
-                 error);
-    return false;
   }
-  connected = true;
-  delete ep;
-  return true;
+  root["accept"] = connected;
+  printMessage(Json::writeString(wbuilder, root), normal);
+  return connected;
 }
 
 void IoMan::disconnect() {
@@ -241,8 +315,6 @@ void IoMan::inputMain() {
   CmdMan::CmdRet cmdret;
   std::unique_lock<std::mutex> ulock;
 
-  size_t prev, index, quot;
-
   printMessage("IoMan::inputMain() begin", debug);
   inputmutex.lock();
   while (runinput) {
@@ -278,86 +350,31 @@ void IoMan::inputMain() {
 
     // process
     for (string cmd : toprocess) {
-      args = vector<string>();
-
-      /* tokenize string into command and arguments vector*/
-      if ((index = cmd.find(" ")) == string::npos) {
-        // only command no args
-        command = cmd;
-      } else {
-        command = cmd.substr(0, index);
-        index++;
-
-        bool end_tokenizing = false;
-        while (!end_tokenizing) {
-          // find first char thats not a space
-          while (cmd[index] == ' ') {
-            index++;
-
-            // bounds check
-            if (index == cmd.size())
-              end_tokenizing = true;
-          }
-          if (end_tokenizing)
-            break;
-
-          cmd = cmd.substr(index);
-
-          if (cmd[0] == '\"') {
-            // quoted string
-            cmd = cmd.substr(1);
-            index = cmd.find("\"");
-            args.push_back(cmd.substr(0, index));
-            index++;
-
-            /*
-            tokens.push_back(cmd.substr(0, ++index));
-            */
-
-            // char after closing quote should be space while within bounds
-            if (index == cmd.size())
-              end_tokenizing = true;
-          } else {
-            // non-quoted string
-            index = cmd.find(" ");
-            if (index == string::npos) { // no spaces, last arg
-              args.push_back(cmd);
-              end_tokenizing = true;
-            } else {
-              args.push_back(cmd.substr(0, index));
-            }
-          }
-        }
-      }
-
+      args = tokenizeInput(cmd);
+      command = args.front();
+      args.erase(args.begin());
       cmdret = cmdman.execute(command, args);
 
       // determine wether to send something and do so if required
-      switch (cmdret.type) {
-      case CmdMan::rettype::send: {
-        printMessage("IoMan::inputMain() sending json \"" + cmdret.msg + "\"",
+      if (cmdret.type & CmdMan::rettype::print) {
+        printMessage(Json::writeString(wbuilder, cmdret.msg), normal);
+      }
+      if (cmdret.type & CmdMan::rettype::send) {
+        printMessage("IoMan::inputMain() sending json \"" +
+                         Json::writeString(wbuilder, cmdret.msg) + "\"",
                      debug);
-        boost::asio::write(*tcpsock, buffer(cmdret.msg + "\n"), errcode);
+        boost::asio::write(
+            *tcpsock, buffer(Json::writeString(wbuilder, cmdret.msg) + "\n"),
+            errcode);
         if (errcode) {
           printMessage("IoMan::inputMain() couldnt send json data\n" +
                            errcode.message() + "\n",
                        error);
           continue;
         }
-        break;
-      }
-      case CmdMan::rettype::notsend: {
-        printMessage(cmdret.msg, normal);
-        break;
-      }
-      case CmdMan::rettype::error: {
-        printMessage(cmdret.msg, error);
-        break;
-      }
-      default: {
-        printMessage(string(__PRETTY_FUNCTION__) + string(" unknown rettype"),
-                     debug);
       }
+      if (cmdret.type & CmdMan::rettype::error) {
+        printMessage(Json::writeString(wbuilder, cmdret.msg), error);
       }
     }
 
@@ -413,15 +430,13 @@ void IoMan::responseMain() {
     // process jsons
     for (Json::Value root : toprocess) {
       cmdret = cmdman.handle(root);
-      switch (cmdret.type) {
-      case CmdMan::rettype::close: {
+      if (cmdret.type & CmdMan::rettype::close) {
         /* TODO i dunno */
         mainmutex.lock();
         runmain = false;
         mainmutex.unlock();
-        break;
       }
-      case CmdMan::rettype::error: {
+      if (cmdret.type & CmdMan::rettype::error) {
         initmutex.lock();
         if (versionstatus == off)
           versionstatus = err;
@@ -429,10 +444,9 @@ void IoMan::responseMain() {
           loginstatus = err;
         initmutex.unlock();
         initcv.notify_all();
-        printMessage(cmdret.msg, error);
-        break;
+        printMessage(Json::writeString(wbuilder, cmdret.msg), error);
       }
-      case CmdMan::rettype::seton: {
+      if (cmdret.type & CmdMan::rettype::seton) {
         initmutex.lock();
         if (versionstatus == off)
           versionstatus = on;
@@ -441,14 +455,13 @@ void IoMan::responseMain() {
         initmutex.unlock();
         initcv.notify_all();
       }
-      case CmdMan::rettype::notsend: {
-        printMessage(cmdret.msg, normal);
-        break;
-      }
-      case CmdMan::rettype::send: {
-        toput.push_back(cmdret.msg);
-        break;
+      if (cmdret.type & CmdMan::rettype::print) {
+        printMessage(Json::writeString(wbuilder, cmdret.msg), normal);
       }
+      if (cmdret.type & CmdMan::rettype::send) {
+        if (cmdret.nextcommand.size()) {
+          toput.push_back(cmdret.nextcommand);
+        }
       }
     }
 
@@ -521,11 +534,11 @@ void IoMan::run() {
 
   while (!user) {
     user = readline(getUserPrompt().c_str());
-    printMessage("Using user: " + string(user), error);
+    printMessage("Using user: " + string(user), debug);
   }
   while (!pass) {
     pass = readline(getPassPrompt().c_str());
-    printMessage("Using pass: " + string(pass), error);
+    printMessage("Using pass: " + string(pass), debug);
   }
 
   printMessage("IoMan::run() login", debug);

cli/src/machineioman.cpp

@@ -21,14 +21,14 @@ void MachineIoMan::printMessage(std::string msg, OutMsgType type) {
     break;
   }
   case debug: {
-    std::cerr << msg << std::endl;
+    //~ std::cerr << msg << std::endl;
     break;
   }
   }
 }
 
 void MachineIoMan::printWelcomeMessage() {
-  std::cout << "please enter user and password" << std::endl;
+  //~ std::cout << "please enter user and password" << std::endl;
 }
 
 std::string MachineIoMan::getCmdPrompt() { return ""; }

cli/src/main.cpp

@@ -35,13 +35,6 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  if (!isdigit(argv[1][0])) {
-    std::printf("invalid ip\n");
-    show_help(argv[0]);
-    std::cout << desc;
-    return 1;
-  }
-
   try {
     store(parse_command_line(argc - 1, argv + 1, desc), vm);
     notify(vm);
@@ -70,8 +63,8 @@ int main(int argc, char **argv) {
   } else {
     ioman = new UserIoMan(argv[1]);
   }
+  gIOMAN = ioman;
   if (ioman->init()) {
-    gIOMAN = ioman;
     ioman->run();
   }
   delete ioman;

cli/src/userioman.cpp

@@ -10,17 +10,50 @@
 
 using boost::asio::buffer;
 
+UserIoMan::UserIoMan(char *ipcstring) : IoMan(ipcstring) {
+
+  /* setup json stuff */
+  Json::CharReaderBuilder rbuilder;
+  wbuilder.settings_["indentation"] = "";
+  reader = rbuilder.newCharReader();
+
+  /* initialize print command map */
+  printmap["connect"] = &UserIoMan::printConnect;
+  printmap["help"] = &UserIoMan::printHelp;
+  printmap["status"] = &UserIoMan::printStatus;
+  printmap["disconnect"] = &UserIoMan::printDisconnect;
+  printmap["put"] = &UserIoMan::printPut;
+  printmap["get"] = &UserIoMan::printGet;
+  printmap["list"] = &UserIoMan::printList;
+  printmap["version"] = &UserIoMan::printVersion;
+  printmap["login"] = &UserIoMan::printLogin;
+  printmap["putdata"] = &UserIoMan::printPutdata;
+  printmap["getdata"] = &UserIoMan::printGetdata;
+}
+
+UserIoMan::~UserIoMan() { delete reader; }
+
 void UserIoMan::printMessage(std::string msg, OutMsgType type) {
+  Json::Value root;
   msgmutex.lock();
   switch (type) {
-  case normal: {
-    std::cout << msg << std::endl;
-    break;
-  }
+  case normal:
   case error: {
-    std::cout << msg << std::endl;
+    // this should never happen outside of development
+    if (!reader->parse(msg.c_str(), msg.c_str() + msg.size(), &root,
+                       &jsonerror)) {
+      printMessage(string(__PRETTY_FUNCTION__) +
+                       " couldnt parse json data: " + jsonerror,
+                   debug);
+    } else {
+      printJson(root);
+    }
     break;
   }
+  //~ case error: {
+  //~ std::cout << msg << std::endl;
+  //~ break;
+  //~ }
   case debug: {
     std::cerr << msg << std::endl;
     break;
@@ -38,3 +71,96 @@ std::string UserIoMan::getCmdPrompt() { return "ccats> "; }
 
 std::string UserIoMan::getUserPrompt() { return "User: "; }
 std::string UserIoMan::getPassPrompt() { return "Pass: "; }
+
+void UserIoMan::printJson(Json::Value root) {
+  map<string, void (UserIoMan::*)(Json::Value)>::iterator it =
+      printmap.find(root["command"].asString());
+  if (it == printmap.end()) {
+    // this should never happen outside of development
+    printMessage(string(__PRETTY_FUNCTION__) + " unknown command \"" +
+                     root["command"].asString() +
+                     "\".\nensure code is implemented.",
+                 debug);
+    return;
+  }
+  (this->*(printmap[root["command"].asString()]))(root);
+}
+
+void UserIoMan::printConnect(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Couldnt connect to " << root["address"].asString() << ":"
+              << root["port"].asUInt() << std::endl
+              << "Reason: " << root["error"].asString() << std::endl;
+  }
+}
+
+void UserIoMan::printHelp(Json::Value root) {
+  std::cout << "Available commands are: " << std::endl;
+  for (Json::Value i : root["names"])
+    std::cout << i.asString() << std::endl;
+}
+
+void UserIoMan::printStatus(Json::Value root) {
+  std::cout << "Server reports status: " << root["response"].asString()
+            << std::endl;
+}
+
+void UserIoMan::printDisconnect(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Disconnect failed." << std::endl;
+  } else {
+    std::cout << "Disconnect successful." << std::endl;
+  }
+}
+
+void UserIoMan::printPut(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Upload request for file " << root["file"].asString()
+              << " failed: " << root["error"].asString() << std::endl;
+  } else
+    std::cout << "Begin uploading file " << root["file"].asString()
+              << std::endl;
+}
+
+void UserIoMan::printGet(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Download request for file " << root["file"].asString()
+              << " failed: " << root["error"].asString() << std::endl;
+  } else
+    std::cout << "Begin downloading file " << root["file"].asString()
+              << std::endl;
+}
+
+void UserIoMan::printList(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Listing files failed: " << root["error"].asString()
+              << std::endl;
+  } else {
+    std::cout << "Listing files stored on server: " << std::endl;
+    for (Json::Value i : root["names"])
+      std::cout << i.asString() << std::endl;
+    std::cout << "End of list." << std::endl;
+  }
+}
+
+void UserIoMan::printVersion(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Version check failed. Server reports "
+              << root["serverversion"].asString() << " but client is "
+              << root["clientversion"].asString() << std::endl;
+  } else
+    std::cout << "Version check ok." << std::endl;
+}
+
+void UserIoMan::printLogin(Json::Value root) {
+  if (!root["accept"].asBool()) {
+    std::cout << "Login failed: " << root["error"].asString() << std::endl;
+  } else
+    std::cout << "Login ok." << std::endl;
+}
+
+void UserIoMan::printPutdata(Json::Value root) {}
+
+void UserIoMan::printGetdata(Json::Value root) {}
+
+void UserIoMan::printListdata(Json::Value root) {}