Merge pull request #6 from lutraconsulting/refactoring

Refactoring

Author: PeterPetrik

.DS_Store

@@ -19,7 +19,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: lutraconsulting/input
-          ref: mergin_cpp
           path: input
 
       - name: Checkout geodiff

.github/workflows/linux.yml

@@ -22,7 +22,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: lutraconsulting/input
-          ref: projects-model-refactoring-main
           path: input
 
       - name: Checkout geodiff

.github/workflows/windows.yml

@@ -1,4 +1,5 @@
 src/config.pri
+src/client.pro.user
 
 # Prerequisites
 *.d

.gitignore

@@ -10,6 +10,10 @@
 #include "clientcommands.h"
 #include <QEventLoop>
 #include <QTimer>
+#include <QTextStream>
+#include <QJsonDocument>
+#include <QJsonObject>
+
 #include "merginuserauth.h"
 
 ClientCommands::ClientCommands( const QString &dir, int timeout ):
@@ -106,6 +110,35 @@ void ClientCommands::sync()
   download( lp.projectNamespace, lp.projectName );
 }
 
+void ClientCommands::info( bool isJsonFormat )
+{
+  LocalProject lp = mLocalProjectsManager.projectFromDirectory( QDir::currentPath() );
+  if ( !lp.isValid() )
+    throw QString( "no mergin project in the current directory" );
+
+  QTextStream out( stdout );
+  if ( isJsonFormat )
+  {
+    QJsonObject jsonData
+    {
+      {"name", QJsonValue( lp.projectName )},
+      {"namespace", QJsonValue( lp.projectNamespace )},
+      {"id", QJsonValue( lp.id() )},
+      {"localVersion", QJsonValue( lp.localVersion )}
+    };
+
+    QJsonDocument doc( jsonData );
+    out << doc.toJson( QJsonDocument::Compact );
+  }
+  else
+  {
+    out << "name: " << lp.projectName << endl;
+    out << "namespace: " << lp.projectNamespace << endl;
+    out << "id: " << lp.id() << endl;
+    out << "localVersion: " << lp.localVersion << endl;
+  }
+}
+
 
 bool ClientCommands::isAuthorized()
 {

src/client.pro.user

@@ -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();