Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

core/imetadataplugin.cpp

@@ -12,8 +12,8 @@
 
 IMetaDataPlugin::IMetaDataPlugin()
 {
-    m_service = NULL;
-    m_ui = NULL;
+    m_service = nullptr;
+    m_ui = nullptr;
 }
 
 IMetaDataPlugin::~IMetaDataPlugin()
@@ -83,18 +83,18 @@ void IMetaDataPlugin::parseMetaData(const QJsonObject &metaData)
         return;
     }
 
-    m_name = parseLocaleText(data.toObject()["name"].toObject());
-    m_description = parseLocaleText(data.toObject()["description"].toObject());
-    m_id = data.toObject()["id"].toString();
-    m_schemaVersion = data.toObject()["schemaVersion"].toInt();
+    auto metaBase = loadBaseMetaData(metaData);
 
-    foreach (QJsonValue schVal, data.toObject()["sql"].toArray()) {
-        m_schemas.append(schVal.toString());
+    if (!metaBase) {
+        return;
     }
 
-    foreach (QJsonValue depVal, data.toObject()["dependecies"].toArray()) {
-        m_dependsOn.append(depVal.toString());
-    }
+    m_name = metaBase->getName();
+    m_description = metaBase->getDescription();
+    m_id = metaBase->getId();
+    m_schemaVersion = metaBase->getSchemaVersion();
+    m_schemas = metaBase->getSchemas();
+    m_dependsOn = metaBase->getDependsOn();
 
     QJsonValue trVal = data.toObject()["translations"];
     QString locale = QLocale::system().name();
@@ -165,3 +165,59 @@ void IMetaDataPlugin::addReportsFromJson(const QJsonValue &repArray)
     }
 }
 
+MetaDataPtr IMetaDataPlugin::loadBaseMetaData(const QJsonObject& metaData) {
+    qDebug() << metaData;
+
+    QJsonValue data = metaData["MetaData"];
+    if (!data.isObject()) {
+        return {};
+    }
+
+    QStringList schemas;
+    for (const QJsonValue& schVal : data.toObject()["sql"].toArray()) {
+        schemas.append(schVal.toString());
+    }
+
+    QStringList dependsOn;
+    for (const QJsonValue& depVal : data.toObject().value("dependencies").toArray()) {
+        dependsOn.append(depVal.toString());
+    }
+
+    return MetaDataPtr::create(
+            parseLocaleText(data.toObject()["name"].toObject()),
+            data.toObject()["id"].toString(),
+            parseLocaleText(data.toObject()["description"].toObject()),
+            data.toObject()["schemaVersion"].toInt(),
+            schemas,
+            dependsOn);
+}
+
+MetaData::MetaData(const QString &mName, const QString &mId, const QString &mDescription, int mSchemaVersion,
+                   const QStringList &mSchemas, const QStringList &mDependsOn)
+                   : m_name(mName), m_id(mId), m_description(mDescription), m_schemaVersion(mSchemaVersion),
+                   m_schemas(mSchemas), m_dependsOn(mDependsOn) {}
+
+const QString& MetaData::getName() const {
+    return m_name;
+}
+
+const QString& MetaData::getId() const {
+    return m_id;
+}
+
+const QString& MetaData::getDescription() const {
+    return m_description;
+}
+
+int MetaData::getSchemaVersion() const {
+    return m_schemaVersion;
+}
+
+const QStringList& MetaData::getSchemas() const {
+    return m_schemas;
+}
+
+const QStringList& MetaData::getDependsOn() const {
+    return m_dependsOn;
+}
+