Merge pull request #1 from einand/add_csv_flag

new flag for csv output

.gitignore

@@ -0,0 +1,6 @@
+*.d
+*.o
+src/cli/cli
+
+ # VSCode
+.vscode

README.md

@@ -1,6 +1,10 @@
 The `src` directory contains the source code to the command line version of
 Bredbandskollen CLI, a bandwidth measurement tool.
 
+# Changes from dotse
+- CVS output
+
+
 # How to build Bredbandskollen's CLI client
 
 Note: Pre-compiled binaries for the most common platforms can be downloaded from

src/cli/cliclient.cpp

@@ -32,6 +32,7 @@ CliClient::CliClient(const TaskConfig &config) :
 #else
  out_is_tty = isatty(fileno(stdout));
 #endif
+ limiter = the_config.value("limiter");
  out_quiet = (the_config.value("quiet") == "1" ||
  the_config.value("logfile") == "-");
  if (!the_config.value("out").empty()) {
@@ -166,24 +167,25 @@ void CliClient::newEventFromAgent(std::deque<std::string> &return_msgs,
  std::string tst = arg_obj["task"].string_value();
  if (tst == "global") {
  if (out_quiet) {
+
  // Enable output:
  out->clear(std::istream::goodbit);
 
  if (the_config.value("quiet") != "1")
  *out << "\n\nRESULT: ";
 
  std::string measurement_id = arg_obj["MeasurementID"].string_value();
- *out << measurement_id << ' ' 
- << report.download << ' '
- << report.upload << ' '
- << report.latency << ' '
- << report.measurement_server << ' '
- << report.isp << ' '
+ *out << measurement_id << limiter 
+ << report.download << limiter
+ << report.upload << limiter
+ << report.latency << limiter
+ << report.measurement_server << limiter
+ << report.isp << limiter
  << report.ticket;
  if (report.rating.empty())
  *out << std::endl;
  else
- *out << ' ' << report.rating << std::endl;
+ *out << limiter << report.rating << std::endl;
  }
  return_msgs.push_back(BridgeTask::msgToAgent("quit"));
  } else if (tst == "latency") {

src/cli/cliclient.h

@@ -39,6 +39,7 @@ class CliClient : public Logger, public SynchronousClient {
  void do_output(double value, const char *msg, bool final = false);
  std::ostream *out;
  bool out_is_tty, out_quiet;
+ std::string limiter = " ";
  std::ostringstream current_line;
  std::string current_header;
  // Set to true during upload and download:

src/cli/utils.cpp

@@ -94,6 +94,9 @@ bool parseArgs(int argc, char *argv[],
  return false;
  } else if (arg == "--quiet") {
  client_cfg.set("quiet", "1");
+ } else if (arg == "--csv") {
+ client_cfg.set("quiet", "1");
+ client_cfg.set("limiter", ",");
  } else if (arg == "--local") {
  mode = (mode == CliMode::NONE) ? CliMode::LOCAL : CliMode::IN_ERROR;
 #if defined(RUN_SERVER)
@@ -217,6 +220,7 @@ bool parseArgs(int argc, char *argv[],
  << "\nCommand line interface:\n"
  << " --quiet Write a single line of output\n"
  << " --out=FILENAME Append output to FILENAME instead of stdout\n"
+ << " --csv Write a single line as comma separated\n"
 #endif
  << std::endl;
  return false;