fix: fallback to gdbus for plasma 6.1

refs: #161

Author: luisbocanegra

package/contents/ui/DBusFallback.qml

@@ -0,0 +1,46 @@
+pragma ComponentBehavior: Bound
+pragma ValueTypeBehavior: Addressable
+
+import QtQuick
+
+Item {
+    id: root
+    property string busType
+    property string service: ""
+    property string objectPath: ""
+    property string iface: ""
+    property string method: ""
+    property var arguments: []
+    property var signature: null
+    property var inSignature: null
+    signal callFinished(reply: var)
+
+    function builCmd() {
+        let cmd = "gdbus call --session --dest " + service + " --object-path " + objectPath + " --method " + iface + "." + method
+        if (root.arguments.length !== 0) {
+            cmd += ` '${root.arguments.join(" ")}'`
+        }
+        return cmd
+    }
+
+    RunCommand {
+        id: runCommand
+        onExited: (cmd, exitCode, exitStatus, stdout, stderr) => {
+            if (exitCode!==0) {
+                console.error(cmd, exitCode, exitStatus, stdout, stderr)
+                return
+            }
+            stdout = stdout
+            .trim()
+            .replace(/^\([']?/, "") // starting ( or ('
+            .replace(/[']?,\)$/, "") // ending ,) or ',)
+            const reply = {value: stdout}
+            root.callFinished(reply)
+        }
+    }
+
+    function call(callback) {
+        runCommand.run(builCmd())
+        if (callback) callFinished.connect(callback)
+    }
+}

package/contents/ui/DBusMethodCall.qml

@@ -1,34 +1,43 @@
-pragma ComponentBehavior: Bound
-pragma ValueTypeBehavior: Addressable
-
 import QtQuick
-import org.kde.plasma.workspace.dbus as DBus
 
-QtObject {
+Item {
     id: root
-    property string busType: DBus.BusType.Session
+    property string busType
     property string service: ""
     property string objectPath: ""
     property string iface: ""
     property string method: ""
     property var arguments: []
     property var signature: null
     property var inSignature: null
+    property bool useGdbus: false
+
+    onArgumentsChanged: dbusLoader.item.arguments = root.arguments
 
-    property DBus.dbusMessage msg: {
-        "service": root.service,
-        "path": root.objectPath,
-        "iface": root.iface,
-        "member": root.method,
-        "arguments": root.arguments,
-        "signature": root.signature,
-        "inSignature": root.inSignature,
+    Loader {
+        id: dbusLoader
+        source: root.useGdbus ? "DBusFallback.qml" : "DBusPrimary.qml"
+        onStatusChanged: {
+            if (status === Loader.Error) {
+                dbusLoader.source = "DBusFallback.qml"
+            }
+        }
+        onLoaded: {
+            dbusLoader.item.service = root.service
+            dbusLoader.item.objectPath = root.objectPath
+            dbusLoader.item.iface = root.iface
+            dbusLoader.item.method = root.method
+            dbusLoader.item.arguments = root.arguments
+            dbusLoader.item.signature = root.signature
+            dbusLoader.item.inSignature = root.inSignature
+        }
     }
 
     function call(callback) {
-        const reply = DBus.SessionBus.asyncCall(root.msg) as DBus.DBusPendingReply
-        if (callback) {
-            reply.finished.connect(() => callback(reply))
+        if (dbusLoader.item && typeof dbusLoader.item.call === "function") {
+            dbusLoader.item.call(callback);
+        } else {
+            console.error("No valid DBus implementation loaded.");
         }
     }
 }

package/contents/ui/DBusPrimary.qml

@@ -0,0 +1,34 @@
+pragma ComponentBehavior: Bound
+pragma ValueTypeBehavior: Addressable
+
+import QtQuick
+import org.kde.plasma.workspace.dbus as DBus
+
+QtObject {
+    id: root
+    property string busType: DBus.BusType.Session
+    property string service: ""
+    property string objectPath: ""
+    property string iface: ""
+    property string method: ""
+    property var arguments: []
+    property var signature: null
+    property var inSignature: null
+
+    property DBus.dbusMessage msg: {
+        "service": root.service,
+        "path": root.objectPath,
+        "iface": root.iface,
+        "member": root.method,
+        "arguments": root.arguments,
+        "signature": root.signature,
+        "inSignature": root.inSignature,
+    }
+
+    function call(callback) {
+        const reply = DBus.SessionBus.asyncCall(root.msg) as DBus.DBusPendingReply
+        if (callback) {
+            reply.finished.connect(() => callback(reply))
+        }
+    }
+}

package/contents/ui/DBusServiceModel.qml

@@ -15,7 +15,6 @@ Item {
     property string serviceUtil: toolsDir+"service.py"
     property string pythonExecutable: plasmoid.configuration.pythonExecutable
     property string serviceCmd: pythonExecutable + " '" + serviceUtil + "' " + Plasmoid.containment.id + " " + Plasmoid.id
-    property string quitServiceCmd: gdbusPartial +".quit"
 
     readonly property string service: Plasmoid.metaData.pluginId + ".c" + Plasmoid.containment.id + ".w" + Plasmoid.id
     readonly property string path: "/preset"

package/contents/ui/code/utils.js

@@ -444,10 +444,6 @@ if (${panelSettings.opacity.enabled}) {
   return setPanelModeScript;
 }
 
-function evaluateScript(script) {
-  runCommand.run("gdbus call --session --dest org.kde.plasmashell --object-path /PlasmaShell --method org.kde.PlasmaShell.evaluateScript '" + script + "'")
-}
-
 function getForceFgWidgetConfig(id, name, config) {
   return config.find((item) => item.id == id && item.name == name)
 }

package/contents/ui/main.qml

@@ -145,7 +145,8 @@ PlasmoidItem {
             } else {
                 panelView.visible = true
             }
-            Utils.evaluateScript(script)
+            dbusEvaluateScript.arguments = [script.toString().replace(/\n/g,' ').trim()]
+            dbusEvaluateScript.call();
             reconfigure()
         })
     }
@@ -1449,6 +1450,19 @@ PlasmoidItem {
         inSignature: null
     }
 
+    DBusMethodCall {
+        id: dbusEvaluateScript
+        service: "org.kde.plasmashell"
+        objectPath: "/PlasmaShell"
+        iface: "org.kde.PlasmaShell"
+        method: "evaluateScript"
+        arguments: []
+        signature: null
+        inSignature: null
+        useGdbus: true
+    }
+
+
     // temporarily show the panel
     Timer {
         id: tempActivationTimer