fix: Non-built-in presets incorrectly marked as built-in

closes: #110
luisbocanegra · Oct 30, 2024 · 11f8e91 · 11f8e91
1 parent 9054b7a
commit 11f8e91
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/package/contents/ui/configPresetAutoload.qml b/package/contents/ui/configPresetAutoload.qml
@@ -18,7 +18,7 @@ KCM.SimpleKCM {
     property string presetsBuiltinDir: Qt.resolvedUrl("./presets").toString().substring(7) + "/"
     property string toolsDir: Qt.resolvedUrl("./tools").toString().substring(7) + "/"
     property string listUserPresetsCmd: "'" + toolsDir + "list_presets.sh' '" + presetsDir + "'"
-    property string listBuiltinPresetsCmd: "'" + toolsDir + "list_presets.sh' '" + presetsBuiltinDir + "'"
+    property string listBuiltinPresetsCmd: "'" + toolsDir + "list_presets.sh' '" + presetsBuiltinDir + "' b"
     property string listPresetsCmd: listBuiltinPresetsCmd+";"+listUserPresetsCmd
 
     property string cfg_presetAutoloading
@@ -39,7 +39,7 @@ KCM.SimpleKCM {
     Connections {
         target: runCommand
         function onExited(cmd, exitCode, exitStatus, stdout, stderr) {
-            // console.log(cmd);
+            console.error(cmd, exitCode, exitStatus, stdout, stderr)
             if (exitCode!==0) return
             // console.log(stdout);
             if(cmd === listPresetsCmd) {

diff --git a/package/contents/ui/configPresets.qml b/package/contents/ui/configPresets.qml
@@ -19,7 +19,7 @@ KCM.SimpleKCM {
     property string presetsBuiltinDir: Qt.resolvedUrl("./presets").toString().substring(7) + "/"
     property string toolsDir: Qt.resolvedUrl("./tools").toString().substring(7) + "/"
     property string listUserPresetsCmd: "'" + toolsDir + "list_presets.sh' '" + presetsDir + "'"
-    property string listBuiltinPresetsCmd: "'" + toolsDir + "list_presets.sh' '" + presetsBuiltinDir + "'"
+    property string listBuiltinPresetsCmd: "'" + toolsDir + "list_presets.sh' '" + presetsBuiltinDir + "' b"
     property string listPresetsCmd: listBuiltinPresetsCmd+";"+listUserPresetsCmd
     property string spectaclePreviewCmd: "spectacle -bn -r -o "
     property var presets: ({})
@@ -54,6 +54,7 @@ KCM.SimpleKCM {
     Connections {
         target: runCommand
         function onExited(cmd, exitCode, exitStatus, stdout, stderr) {
+            console.error(cmd, exitCode, exitStatus, stdout, stderr)
             if (exitCode!==0) return
             if(cmd === listPresetsCmd) {
                 presets = ({})

diff --git a/package/contents/ui/tools/list_presets.sh b/package/contents/ui/tools/list_presets.sh
@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
 PRESETS_DIR="$1"
+BUILTIN="$2"
 
-find "$PRESETS_DIR" -mindepth 1 -prune -type d -print0 | while IFS= read -r -d '' preset; do echo b:"$preset"; done | sort
+find "$PRESETS_DIR" -mindepth 1 -prune -type d -print0 | while IFS= read -r -d '' preset; do
+  if [[ -n $BUILTIN ]]; then
+    echo "b:$preset"
+  else
+    echo "u:$preset"
+  fi
+done | sort