switched over to using QJson types for almost all JSON

headers/util.hpp

@@ -2,6 +2,9 @@
 #define UTIL_HPP
 #pragma GCC system_header
 #include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
 #include <QQueue>
 #include <QString>
 #include <QMessageBox>
@@ -90,12 +93,59 @@ QString configValue(QString key, ConfigJson config, bool use_default = false) {
   return "";
 }
 
+QString configValue(QString key, QJsonObject config, bool use_default = false) {
+  if (!config.contains(key) && use_default) {
+    if (config.contains("default")) {
+      return config.value("default").toString();
+    }
+  } else {
+    return config.value(key).toString();
+  }
+  return "";
+}
+
+QList<QString> configValueToQList(QString key, QJsonObject config) {
+  QList<QString> list{};
+  if (config.contains(key)) {
+    auto value = config.value(key);
+    if (value.isArray()) {
+      for (auto && item : value.toArray()) {
+        list.append(item.toString());
+      }
+    }
+  }
+  return list;
+}
+
+QJsonObject configObject(QString key, QJsonObject config, bool use_default = false) {
+  auto key_value = key.toLower();
+  if (!config.contains(key_value) && use_default) {
+    if (config.contains("default")) {
+      return config["default"].toObject();
+    }
+  } else {
+    return config[key_value].toObject();
+  }
+  qDebug() << "Returning empty QJsonObject :(";
+  return QJsonObject{};
+}
+
+QJsonObject loadJsonConfig(QString json_string) {
+  return QJsonDocument::fromJson(json_string.toUtf8()).object();
+}
+
 bool configBoolValue(QString s, ConfigJson config) {
   if (auto it{config.find(s)}; it != std::end(config)) {
     return bool{it->second == "true"};
   }
 }
 
+bool configBoolValue(QString key, QJsonObject config) {
+  if (config.contains(key)) {
+    return bool{config.value(key).toString().compare("true") == 0};
+  }
+}
+
 std::string getJsonString(std::string s) {
     Document d;
     d.Parse(s.c_str());

include/ui/argdialog.h

@@ -32,7 +32,7 @@ class ArgDialog : public QDialog {
   void setFilePath(QString path);
   virtual void accept() override;
   void setAppName(QString task_name);
-  void setConfig(QString config_string);
+  void setConfig(QJsonObject config);
   void notifyClientSuccess();
 
   ~ArgDialog();
@@ -58,7 +58,7 @@ class ArgDialog : public QDialog {
   void addFile(QString path);
   Task *m_task;
   QString m_file_path;
-  QString m_config_string;
+  QJsonObject m_config;
   QString m_app_name;
 };
 

include/ui/mainwindow.h

@@ -93,7 +93,7 @@ public:
     QStandardItemModel* m_event_model;
     KListViewsStates m_view_states;
     /** Misc */
-    ConfigJson m_config;
+    QJsonObject m_config;
     uint16_t m_consecutive_events;
 
    private slots:

src/argdialog.cpp

@@ -163,7 +163,9 @@ void ArgDialog::showEvent(QShowEvent* event) {
       ui->argType->addItem(name, QVariant::String);
     }
 
-    ui->user->addItems(getValueArgs(m_config_string.toUtf8(), "users"));
+    if (m_config.contains("users")) {
+      ui->user->addItems(configValueToQList("users", m_config));
+    }
     if (ui->user->count() > 0) {
       m_task->setArgument("user", ui->user->itemText(0));
     }
@@ -373,8 +375,8 @@ void ArgDialog::setAppName(QString app_name) {
  * @brief ArgDialog::setConfig
  * @param config_string
  */
-void ArgDialog::setConfig(QString config_string) {
-  m_config_string = config_string;
+void ArgDialog::setConfig(QJsonObject config) {
+  m_config = config;
 }
 
 /**

src/mainwindow.cpp

@@ -151,8 +151,8 @@ void MainWindow::setConnectScreen(bool visible) {
 void MainWindow::connectClient() {
   auto text = ui->kyConfig->toPlainText();
   qDebug() << text;
-  m_config = getConfigObject(ui->kyConfig->toPlainText());
-  QString file_path = m_config.at("fileDirectory");
+  m_config = loadJsonConfig(ui->kyConfig->toPlainText());
+  QString file_path = configValue("fileDirectory", m_config);
   if (file_path != NULL) {
     arg_ui->setFilePath(file_path);
   }
@@ -183,7 +183,8 @@ void MainWindow::connectClient() {
         QString app_name = ui->appList->currentText();
         q_client->setSelectedApp(std::vector<QString>{{app_name}});
         arg_ui->setAppName(app_name);
-        arg_ui->setConfig(configValue(app_name, m_config, true));
+        auto json_object = configObject(app_name, m_config, true);
+        arg_ui->setConfig(json_object);
       });
   QPushButton* disconnect_button = this->findChild<QPushButton*>("disconnect");
   QObject::connect(disconnect_button, &QPushButton::clicked, this, [this]() {
@@ -276,9 +277,9 @@ void MainWindow::onMessageReceived(int t, const QString& message, StringVec v) {
     message_parser.handleCommands(v, default_app);
     if (message == "New Session") {  // Session has started
       ui->led->setState(true);
-      auto app_name = q_client->getAppName(q_client->getSelectedApp());
-      arg_ui->setConfig(configValue(app_name, m_config, true));
       if (configBoolValue("schedulerMode", std::ref(m_config))) {
+        auto app_name = q_client->getAppName(q_client->getSelectedApp());
+        arg_ui->setConfig(configObject(app_name, m_config, true));
         arg_ui->show();
       }
     }