Optimize usage of jq (#56)

* Don't check to what file path leads to

in check_not_exists_file

* Optimize function name

check_not_exists_file => check_if_file_exists

* Call jq once per file

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 602f2628c6e3133d7fae217f78ce94fe3ef7eb41..8fe952f32097b4703ccbb53c2f535a7f9e27b795 100755 (executable)
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -88,12 +88,10 @@ apply_shell_expansion() {
 
 # Returns 0 if the path doesn't lead anywhere
 # Return 1 if the path points to a file, 2 if it points to a directory
 
 # Returns 0 if the path doesn't lead anywhere
 # Return 1 if the path points to a file, 2 if it points to a directory

-check_not_exists_file() {
+check_if_file_exists() {

     FILE_PATH=$(apply_shell_expansion "$1")
     FILE_PATH=$(apply_shell_expansion "$1")

-    if [ -f "$FILE_PATH" ]; then
+    if [ -e "$FILE_PATH" ]; then

         return 1
         return 1

-    elif [ -d "$FILE_PATH" ]; then
-        return 2

     else
         return 0
     fi
     else
         return 0
     fi


@@ -140,14 +138,12 @@ log() {
 
 # Checks that the given file does not exist, otherwise outputs help
 check_file() {
 
 # Checks that the given file does not exist, otherwise outputs help
 check_file() {

-    INPUT="$1"
-    NAME="$2"
-
-    FILENAME=$(printf "%s" "$INPUT" | jq -r .path)
-    MOVABLE=$(printf "%s" "$INPUT" | jq -r .movable)
-    HELP=$(printf "%s" "$INPUT" | jq -r .help)
+    NAME="$1"
+    FILENAME="$2"
+    MOVABLE="$3"
+    HELP="$4"

 
 

-    check_not_exists_file "$FILENAME"
+    check_if_file_exists "$FILENAME"

 
     case $? in
 
 
     case $? in
 


@@ -155,7 +151,7 @@ check_file() {
         log SUCS "$NAME" "$FILENAME" "$HELP"
         ;;
 
         log SUCS "$NAME" "$FILENAME" "$HELP"
         ;;
 

-    1 | 2)
+    1)

         if "$MOVABLE"; then
             log ERR "$NAME" "$FILENAME" "$HELP"
         else
         if "$MOVABLE"; then
             log ERR "$NAME" "$FILENAME" "$HELP"
         else


@@ -171,16 +167,22 @@ check_file() {
     esac
 }
 
     esac
 }
 

+decode_string() {
+    tmp="${1#\"}" # Trim leading quote
+    tmp="${tmp%\"}" # Trim traling quote
+    printf "%s" "$(echo "$tmp" | sed -e 's/\\n/\
+/g' -e 's/\\\"/\"/g')" # Replace \n with literal newline and \" with "
+}
+

 # Reads a file from programs/, calls check_file on each file specified for the program
 check_program() {
     PROGRAM=$1
 
 # Reads a file from programs/, calls check_file on each file specified for the program
 check_program() {
     PROGRAM=$1
 

-    NAME=$(jq -r .name "$PROGRAM")
-
-    while IFS= read -r file; do
-        check_file "$file" "$NAME"
+    while IFS="
+" read -r name; read -r filename; read -r movable; read -r help; do
+        check_file "$(decode_string "$name")" "$(decode_string "$filename")" "$movable" "$(decode_string "$help")"

     done <<EOF
     done <<EOF

-$(jq -rc '.files[]' "$PROGRAM")
+$(jq '.files[] as $files | .name, $files.path, $files.movable, $files.help' "$PROGRAM")

 EOF
 }
 
 EOF
 }