Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-01 19:18:28 -04:00
Code Packages Releases Activity

calendar/dcal: fix flatpak socket detection

Browse Source 
port 1.5
This commit is contained in:
bbedward
2026-07-23 10:14:12 -04:00
parent 5538913320
commit d818067bee
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/CalendarDankBackend.qml
+19 -8
View File
@@ -15,8 +15,10 @@ Item {
property string socketPath: "" property string socketPath: ""
readonly property bool socketFound: socketPath.length > 0 readonly property bool socketFound: socketPath.length > 0
property bool connected: false property bool connected: false
property bool binaryExists: false readonly property bool binaryExists: launchKind.length > 0
property bool binaryChecked: false property bool binaryChecked: false
// "dcal" for a host install, "flatpak" for a sandboxed one, "" for neither.
property string launchKind: ""
property var calendars: [] property var calendars: []
property var events: [] property var events: []
@@ -55,18 +57,20 @@ Item {
Process { Process {
id: binaryCheck id: binaryCheck
command: ["sh", "-c", "command -v dcal"] command: ["sh", "-c", "if command -v dcal >/dev/null 2>&1; then echo dcal; elif command -v flatpak >/dev/null 2>&1 && flatpak info com.danklinux.dankcalendar >/dev/null 2>&1; then echo flatpak; fi"]
running: false running: false
onExited: code => { stdout: StdioCollector {
root.binaryExists = (code === 0); onStreamFinished: {
root.binaryChecked = true; root.launchKind = text.trim();
root.binaryChecked = true;
}
} }
} }
Process { Process {
id: discoverProcess id: discoverProcess
running: false running: false
command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"] command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/app/com.danklinux.dankcalendar/dankcal-*.sock; do if [ -S \"$f\" ]; then echo \"$f\"; exit 0; fi; done; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"]
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
@@ -98,9 +102,16 @@ Item {
} }
function launch() { function launch() {
if (!binaryExists) switch (launchKind) {
case "dcal":
Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]);
break;
case "flatpak":
Quickshell.execDetached(["flatpak", "run", "com.danklinux.dankcalendar", "run", "-d", "--hidden"]);
break;
default:
return; return;
Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]); }
if (enabled && !connected) if (enabled && !connected)
discoverProcess.running = true; discoverProcess.running = true;
} }