fix #5 info command

Author: PeterPetrik

src/clientcommands.cpp

@@ -10,6 +10,8 @@
 #include "clientcommands.h"
 #include <QEventLoop>
 #include <QTimer>
+#include <QTextStream>
+
 #include "merginuserauth.h"
 
 ClientCommands::ClientCommands( const QString &dir, int timeout ):
@@ -106,6 +108,61 @@ void ClientCommands::sync()
   download( lp.projectNamespace, lp.projectName );
 }
 
+static void printVal( bool isJsonFormat,
+                      QTextStream &out,
+                      const QString &key,
+                      const QString &val,
+                      bool isLast )
+{
+
+  QChar separator;
+  QChar quote;
+  QString space;
+  if ( isJsonFormat )
+  {
+    separator = ',';
+    quote = '"';
+  }
+  else
+  {
+    separator = '\n';
+    space = " ";
+  }
+
+  out << quote << key << quote << ":"  << space << quote << val << quote
+      ;
+
+  if ( !isLast )
+    out << separator;
+}
+
+void ClientCommands::info( bool isJsonFormat )
+{
+  Q_ASSERT( isAuthorized() );
+  LocalProject lp = mLocalProjectsManager.projectFromDirectory( QDir::currentPath() );
+  if ( !lp.isValid() )
+    throw QString( "no mergin project in the current directory" );
+
+  QTextStream out( stdout );
+
+  QChar prefix;
+  QChar suffix;
+  if ( isJsonFormat )
+  {
+    suffix = '}';
+    prefix = '{';
+  } else {
+    suffix = '\n';
+  }
+
+  out << prefix;
+  printVal( isJsonFormat, out, "name", lp.projectName, false );
+  printVal( isJsonFormat, out, "namespace", lp.projectNamespace, false );
+  printVal( isJsonFormat, out, "id", lp.id(), false );
+  printVal( isJsonFormat, out, "localVersion", QString::number( lp.localVersion ), true );
+  out << suffix;
+}
+
 
 bool ClientCommands::isAuthorized()
 {

src/clientcommands.h

@@ -31,6 +31,7 @@ class ClientCommands: public QObject
     void remove( const QString &projectNamespace, const QString &projectName );
     void download( const QString &projectNamespace, const QString &projectName );
     void sync( );
+    void info( bool isJsonFormat );
 
   private:
     bool isAuthorized();

src/clientmain.cpp

@@ -26,6 +26,7 @@ struct Args
   QString projectName;
   QString dataDir;
   QString logFile;
+  bool isJsonFormat;
   int timeout = 10000;
 };
 
@@ -56,10 +57,12 @@ Args parseArgs()
   parser.setApplicationDescription( "Mergin Command Line Client" );
   QCommandLineOption helpOption = parser.addHelpOption();
   QCommandLineOption versionOption = parser.addVersionOption();
-  QCommandLineOption logOption("log", "log file (debug output)", "log");
-  parser.addOption(logOption);
+  QCommandLineOption logOption( "log", "log file (debug output)", "log" );
+  parser.addOption( logOption );
+  QCommandLineOption jsonOption( "json", "output as JSON format (e.g. in info format)", "json" );
+  parser.addOption( jsonOption );
 
-  parser.addPositionalArgument( "command", "create/remove/download/sync" );
+  parser.addPositionalArgument( "command", "create/remove/download/sync/info" );
   parser.addPositionalArgument( "project", "namespace/projectname [only for create/remove/download]" );
 
   QCommandLineOption urlOption( "url", "or use env. var MERGIN_URL. defaults to https://public.cloudmergin.com/", "url" );
@@ -82,11 +85,10 @@ Args parseArgs()
   args.user = parseEnvArg( parser.value( userOption ), "MERGIN_USER" );
   args.pass = parseEnvArg( parser.value( passwordOption ), "MERGIN_PASSWORD" );
   args.logFile = parser.value( logOption );
+  args.isJsonFormat = parser.isSet( jsonOption );
 
-
-
-  if (!args.logFile.isEmpty())
-    CoreUtils::setLogFilename(args.logFile);
+  if ( !args.logFile.isEmpty() )
+    CoreUtils::setLogFilename( args.logFile );
 
   args.command = posArgs.at( 0 );
   if ( args.command == "create" ||
@@ -105,7 +107,8 @@ Args parseArgs()
     args.dataDir = QDir::currentPath();
 
   }
-  else if ( args.command == "sync" )
+  else if ( args.command == "sync" ||
+            args.command == "info" )
   {
     QDir current = QDir::current();
     current.cdUp();
@@ -157,6 +160,10 @@ int main( int argc, char *argv[] )
     {
       cmd.sync();
     }
+    else if ( args.command == "info" )
+    {
+      cmd.info( args.isJsonFormat );
+    }
     else
     {
       throw QString( "invalid command" ) + args.command;