fix: improve performance on theme change

Author: kRHYME7

Configs/.local/lib/hyde/color.set.sh

@@ -102,27 +102,34 @@ preprocess_substitutions() {
 }
 
 fn_wallbash() {
-    local template="${1}"
-    local temp_target_file exec_command
+    local temp_target_file exec_command template wallbash_dirs_array
+    template="${1}"
+    shift
+    wallbash_dirs_array=("${@}")
     WALLBASH_SCRIPTS="${template%%/wallbash/*}/wallbash/scripts"
-    
+
     if [[ "${template}" == *.theme ]]; then
         # This is approach is to handle the theme files
         # We don't want themes to launch the exec_command or any arbitrary codes
         # To enable this we should have a *.dcol file as a companion to the theme file
-        IFS=':' read -r -a wallbashDirs <<<"$WALLBASH_DIRS"
+        # IFS=':' read -r -a wallbash_dirs_array <<<"$wallbash_dirs"
+        local template_name 
         template_name="${template##*/}"
         template_name="${template_name%.*}"
-        # echo "${wallbashDirs[@]}"
-        dcolTemplate=$(find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "${template_name}.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++')
+        dcolTemplate=$(find -H "${wallbash_dirs_array[@]}" -type f -path "*/theme*" -name "${template_name}.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++')
+        # dcolTemplate="$(find "${wallbash_dirs_array[@]}" -H -type f -path "*/theme*" -name "${template_name}.dcol" -print -quit)"
         if [[ -n "${dcolTemplate}" ]]; then
             eval target_file="$(head -1 "${dcolTemplate}" | awk -F '|' '{print $1}')"
             exec_command="$(head -1 "${dcolTemplate}" | awk -F '|' '{print $2}')"
             WALLBASH_SCRIPTS="${dcolTemplate%%/wallbash/*}/wallbash/scripts"
         fi
     fi
 
-    [[ "${LOG_LEVEL}" == "debug" ]] && print_log -sec "wallbash" -stat "Template:" " ${template}"
+    if [[ "${LOG_LEVEL}" == "debug" ]];then
+     print_log -sec "wallbash" -stat "Template:" " ${template}"
+     print_log -sec "wallbash" -stat "Wallbash Directories:" " ${wallbash_dirs_array[*]}"
+     print_log -sec "wallbash" -stat "Wallbash Scripts:" " ${WALLBASH_SCRIPTS}"
+    fi
 
     # shellcheck disable=SC1091
     # shellcheck disable=SC2154
@@ -166,8 +173,6 @@ fn_wallbash() {
         bash -c "${exec_command}" &
         disown
     }
-
-    unset WALLBASH_SCRIPTS
 }
 
 scrDir="$(dirname "$(realpath "$0")")"
@@ -291,6 +296,8 @@ fi
 
 #// switch theme <//> wall based colors
 
+print_log -sec "wallbash" -stat "wallbash directories" " $WALLBASH_DIRS"
+
 # shellcheck disable=SC2154
 if [ "${enableWallDcol}" -eq 0 ] && [[ "${reload_flag}" -eq 1 ]]; then
 
@@ -303,13 +310,14 @@ if [ "${enableWallDcol}" -eq 0 ] && [[ "${reload_flag}" -eq 1 ]]; then
     done < <(find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++')
 
     # Process templates in parallel
-    parallel fn_wallbash ::: "${deployList[@]}" || true
+    parallel fn_wallbash {} "$wallbashDirs[@]" ::: "${deployList[@]}" || true
+
 
 elif [ "${enableWallDcol}" -gt 0 ]; then
     print_log -sec "wallbash" -stat "apply ${dcol_mode} colors" "Wallbash theme"
     # This is the reason we avoid SPACES for the wallbash template names
-    find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} || true
+    find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} "${wallbashDirs[@]}"  || true
 fi
 
 # Process "always" templates in parallel
-find -H "${wallbashDirs[@]}" -type f -path "*/always*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} || true
+find -H "${wallbashDirs[@]}" -type f -path "*/always*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} "${wallbashDirs[@]}" || true