feat: add --get-all argument

Author: timschneeb

src/config/DspConfig.h

@@ -215,11 +215,16 @@ class DspConfig :
     }
 
 
-	void save()
-	{
-		auto file = AppConfig::instance().getDspConfPath();
-		ConfigIO::writeFile(file, _conf->getConfigMap());
-	}
+    QString serialize()
+    {
+        return ConfigIO::writeString(_conf->getConfigMap());
+    }
+
+    void save()
+    {
+        auto file = AppConfig::instance().getDspConfPath();
+        ConfigIO::writeFile(file, _conf->getConfigMap());
+    }
 
 	void load()
 	{

src/main.cpp

@@ -167,6 +167,7 @@ int main(int   argc,
     QCommandLineOption isConnected(QStringList() << "is-connected", "Check if JamesDSP service is active. Returns exit code 1 if not. (Remote)");
     QCommandLineOption status(QStringList() << "status", "Show status (Remote)");
     QCommandLineOption listKeys(QStringList() << "list-keys", "List available audio configuration keys (Remote)");
+    QCommandLineOption getAll(QStringList() << "get-all", "Get all audio configuration values (Remote)");
     QCommandLineOption get(QStringList() << "get", "Get audio configuration value (Remote)", "key");
     QCommandLineOption set(QStringList() << "set", "Set audio configuration value (format: key=value) (Remote)", "key=value");
     QCommandLineOption loadPreset(QStringList() << "load-preset", "Load preset by name (Remote)", "name");
@@ -189,7 +190,7 @@ int main(int   argc,
     parser.addOptions({silent, nocolor, minVerbosity});
 
     // Remote control
-    auto remoteCmds = {isConnected, listKeys, get, set, loadPreset, savePreset, deletePreset, listPresets, status};
+    auto remoteCmds = {isConnected, listKeys, getAll, get, set, loadPreset, savePreset, deletePreset, listPresets, status};
     parser.addOptions(remoteCmds);
 
     parser.process(*app.get());
@@ -246,6 +247,9 @@ int main(int   argc,
                 result = ctrl.set(out.first, out.second);
             }
         }
+        else if(parser.isSet(getAll)) {
+            result = ctrl.getAll();
+        }
         else if(!parser.value(get).isEmpty()) {
             result = ctrl.get(parser.value(get));
         }

src/utils/CliRemoteController.cpp

@@ -91,6 +91,25 @@ bool CliRemoteController::get(const QString &key) const
     return result.has_value();
 }
 
+bool CliRemoteController::getAll() const
+{
+    std::optional<QString> result;
+    if(!checkConnectionAndLog()) {
+        result = DspConfig::instance().serialize();
+    }
+    else {
+        auto reply = service->getAll();
+        auto received = handleReply<QString>(reply);
+        result = received;
+    }
+
+    if(result.has_value()) {
+        Log::console(result.value(), true);
+    }
+
+    return result.has_value();
+}
+
 bool CliRemoteController::listKeys() const
 {
     QStringList keys;

src/utils/CliRemoteController.h

@@ -14,6 +14,7 @@ class CliRemoteController : public QObject
     bool isConnected() const;
     bool set(const QString& key, const QVariant& value) const;
     bool get(const QString& key) const;
+    bool getAll() const;
     bool listKeys() const;
     bool listPresets() const;
     bool loadPreset(const QString& name) const;

src/utils/dbus/ClientProxy.h

@@ -105,6 +105,12 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QStringLiteral("get"), argumentList);
     }
 
+    inline QDBusPendingReply<QString> getAll()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("getAll"), argumentList);
+    }
+
     inline QDBusPendingReply<QStringList> getKeys()
     {
         QList<QVariant> argumentList;

src/utils/dbus/IpcHandler.cpp

@@ -90,6 +90,11 @@ QString IpcHandler::get(const QString &key) const
     return value.toString();
 }
 
+QString IpcHandler::getAll() const
+{
+    return DspConfig::instance().serialize();
+}
+
 void IpcHandler::set(const QString &key, const QDBusVariant &value) const
 {
     setInternal(key, value);

src/utils/dbus/IpcHandler.h

@@ -43,6 +43,7 @@ public slots:
     void set(const QString &key, const QDBusVariant &value) const;
     void setAndCommit(const QString &key, const QDBusVariant &value) const;
     QString get(const QString &key) const;
+    QString getAll() const;
     QStringList getPresets() const;
     void loadPreset(const QString &name) const;
     void savePreset(const QString &name) const;

src/utils/dbus/ServerAdaptor.cpp

@@ -111,6 +111,14 @@ QString ServiceAdaptor::get(const QString &key)
     return value;
 }
 
+QString ServiceAdaptor::getAll()
+{
+    // handle method call me.timschneeberger.jdsp4linux.Service.getAll
+    QString kvpairs;
+    QMetaObject::invokeMethod(parent(), "getAll", Q_RETURN_ARG(QString, kvpairs));
+    return kvpairs;
+}
+
 QStringList ServiceAdaptor::getKeys()
 {
     // handle method call me.timschneeberger.jdsp4linux.Service.getKeys

src/utils/dbus/ServerAdaptor.h

@@ -67,6 +67,9 @@ class ServiceAdaptor: public QDBusAbstractAdaptor
 "      <arg direction=\"in\" type=\"s\" name=\"key\"/>\n"
 "      <arg direction=\"out\" type=\"s\" name=\"value\"/>\n"
 "    </method>\n"
+"    <method name=\"getAll\">\n"
+"      <arg direction=\"out\" type=\"s\" name=\"kvpairs\"/>\n"
+"    </method>\n"
 "    <method name=\"set\">\n"
 "      <arg direction=\"in\" type=\"s\" name=\"key\"/>\n"
 "      <arg direction=\"in\" type=\"v\" name=\"value\"/>\n"
@@ -117,6 +120,7 @@ public Q_SLOTS: // METHODS
     void commit();
     void deletePreset(const QString &name);
     QString get(const QString &key);
+    QString getAll();
     QStringList getKeys();
     QStringList getPresets();
     void loadPreset(const QString &name);

src/utils/dbus/manifest.xml

@@ -25,6 +25,10 @@
                 <arg name="value" type="s" direction="out"/>
             </method>
 
+            <method name="getAll">
+                <arg name="kvpairs" type="s" direction="out"/>
+            </method>
+
             <method name="set">
                 <arg name="key" type="s" direction="in"/>
                 <arg name="value" type="v" direction="in"/>