Various fixes

- kbmenu reads python_path from kbconfig
- preview handles filenames with spaces
- logging slightly quieter

Author: jfhbrook

Diff for: korbenware/bin/kbconfig

@@ -24,6 +24,9 @@ DEFAULTS = {
     "background": {
         "path": "/usr/share/backgrounds",
         "sway_args": "fill"
+    },
+    "menu": {
+        "python_path": ""
     }
 }
 

Diff for: korbenware/bin/kbmenu

@@ -6,27 +6,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-PYTHON="${PYTHON:-/usr/bin/python3}"
+PYTHON="$(kbconfig get menu python_path)"
+if [ -z "${PYTHON}" ]; then
+  PYTHON=/usr/bin/python3
+fi
 DEBUG="${DEBUG:-}"
 
 function log-debug {
   if [ ! -z "${DEBUG}" ]; then
-    echo "debug: $1"
+    echo "debug:" "$@"
   fi
 }
 
 function log-info {
-  echo "info: $1"
+  echo "info:" "$@"
 }
 
-function log-error {
-  echo "ERROR: $1" 1>&2
-}
 
 log-info "Grandmaw Korben's XDG Menu Explorer 🦜"
 log-info '"nice work, pixel birdie!"'
 log-info "programmed entirely while unemployed"
-log-info "it worked if it ends with ok"
+log-debug "it worked if it ends with ok"
 
 __PRELUDE='
 import xdg.Menu
@@ -70,7 +70,7 @@ COMMENTS = dict()
 for path in __walk([], xdg.Menu.parse()):
     COMMENTS[__key(path)] = path[-1].DesktopEntry.getComment()
 
-print(COMMENTS[sys.argv[1]])
+print(COMMENTS[" ".join([arg for arg in sys.argv[1:] if arg])])
 '
 
 __COMMAND="${__PRELUDE}"'
@@ -86,8 +86,8 @@ for path in __walk([], xdg.Menu.parse()):
 print(COMMANDS[sys.argv[1]])
 '
 
-CHOICE="$(python -c "${__PREVIEW}" | fzf -m --preview "python -c '${__GET}' '{1}'")"
+CHOICE="$("${PYTHON}" -c "${__PREVIEW}" | fzf -m --preview '"'"${PYTHON}"'"'" -c '${__GET}' '{1}' '{2}' '{3}' '{4}' '{5}' '{6}' '{7}' '{8}'")"
 
-eval "nohup $(python -c "${__COMMAND}" "${CHOICE}") &> /dev/null &"
+eval "nohup $("${PYTHON}" -c "${__COMMAND}" "${CHOICE}") &> /dev/null &"
 
-log-info "ok"
+log-debug "ok"

Diff for: korbenware/bin/kbopen

@@ -18,17 +18,17 @@ function log-debug {
 }
 
 function log-info {
-  echo "info: $1"
+  echo "info:" "$@"
 }
 
 function log-error {
-  echo "ERROR: $1" 1>&2
+  echo "ERROR:" "$@"  1>&2
 }
 
 log-info "Korby Jr. The File/Url Opener 🦜"
 log-info "programmed entirely while eating a spider plant"
 log-info '"open up or else!"'
-log-info "it worked if it ends with ok"
+log-debug "it worked if it ends with ok"
 
 function log-help {
   log-info "Open files and URLs with default and mime-appropriate XDG applications"
@@ -61,8 +61,8 @@ else
 fi
 
 while [ -d "${PATH_OR_URL}" ]; do
-  log-info "Searching in ${PATH_OR_URL} with fzf"
-  PATH_OR_URL="$(find "${PATH_OR_URL}" | fzf --preview "kbprev {}")"
+  log-debug "Searching in ${PATH_OR_URL} with fzf"
+  PATH_OR_URL="$(find "${PATH_OR_URL}" | fzf --preview "kbprev '{}'")"
 done
 
 log-debug "Path or URL: ${PATH_OR_URL}"
@@ -94,4 +94,4 @@ case $MIME_TYPE in
     eval "${OPEN_CMD} '${PATH_OR_URL}'"
 esac
 
-log-info "ok"
+log-debug "ok"

Diff for: korbenware/bin/kbprev

@@ -35,7 +35,8 @@ log-info "Korben's Cool Babysitter's File Preview 🦜"
 log-info "programmed while changing Korby Jr's diaper"
 log-info "it worked if it ends with ok"
 
-FILE="${1:-}"
+ARGS="$@"
+FILE=$(IFS=, ; echo "${ARGS[*]}")
 
 if [ -d "${FILE}" ]; then
   ls -l