improve speed

diff --git a/admone.zsh b/admone.zsh
index dfbb9c398c939b4cc7da5db1a12f595254ba8a9d..9b5e9d4b33704fa8696a50c380c3057246d1ae45 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -30,43 +30,31 @@ ADMONE_BLOCK_RIGHT="]"
 ADMONE_VI_MODE_CURSOR="1"
   # ADMONE_VI_MODE_CURSOR="1"
 ADMONE_SHOW_0_EXIT_CODE="0"
-ADMONE_GIT_SHOW_BLANK="1"
-ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code;admone-time"
+ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code"
 ADMONE_FORMAT_LOWER="%B%F{%(?.cyan.red)}"
 
-function admone-pwd {
+admone-pwd() {
   echo "%F{blue}%~%f"
 }
-function admone-git {
+admone-git() {
   git_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
-  if [[ $ADMONE_GIT_SHOW_BLANK == "0" ]]; then
-    if [[ ${git_branch//\%/%%} == "" ]]; then
-      echo "%F{blue}n/a%f"
-    else
-      echo "%F{green}${git_branch//\%/%%}%f"
-    fi
-  else
-    echo "%F{green}${git_branch//\%/%%}%f"
-  fi
+  echo "%F{green}${git_branch}%f"
 }
-function admone-exit-code {
-  if [[ $ADMONE_SHOW_0_EXIT_CODE == "1" ]]; then
-    echo "%(?,%F{cyan}%?%f,%F{red}%?%f)"
-  elif [[ $ADMONE_SHOW_0_EXIT_CODE == "0" ]]; then
-    echo "%(?,,%F{red}%?%f)"
-  fi
+admone-exit-code() {
+  ([[ $ADMONE_SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
+  echo "%(?,,%F{red}%?%f)"
 }
-function admone-date {
+admone-date() {
   echo $(date -I)
 }
-function admone-12hr {
+admone-12hr() {
   echo $(date +%r)
 }
-function admone-24hr {
+admone-24hr() {
   echo $(date +%T)
 }
 # Intergration with https://codeberg.org/armaan/zsh-command-time
-function admone-time {
+admone-time() {
   echo "%F{cyan}$timer_show%f"
 }
 
@@ -94,7 +82,7 @@ function zle-keymap-select zle-line-init zle-line-finish {
   fi
 }
 
-function set-prompt() {
+set-prompt() {
   # Reset prompts
   upper="${ADMONE_PRE_UPPER}"
   lower="${ADMONE_PRE_LOWER}${ADMONE_FORMAT_LOWER}${ADMONE_PROMPT_CHAR}%f%b "
@@ -102,13 +90,9 @@ function set-prompt() {
   # Add in functions as defined above
   NUM_FUNCS="$(echo $ADMONE_INCLUDE | grep -o ';' | wc -l)"
   for (( i = 0; i <= $NUM_FUNCS; i++ )); do
-    (( val = $i + 1 ))
-    THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $val)"
-   if [[ $i == 0 ]]; then
-      upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
-    else
-      upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
-    fi
+    THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $(($i + 1)))"
+    [[ $i == 0 ]] && upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+    [[ $i == 0 ]] || upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
   done
 
   # Add line above