Browse Source

Performance enhancement for lib/grep

- Use $ZSH_CACHE_DIR to store the grep alias with all the right features
- Expire the cache after 24 hours
- See issue #8444
mattmc3 4 years ago
parent
commit
57b178102c
1 changed files with 34 additions and 23 deletions
  1. 34 23
      lib/grep.zsh

+ 34 - 23
lib/grep.zsh

@@ -1,29 +1,40 @@
-# is x grep argument available?
-grep-flag-available() {
-    echo | grep $1 "" >/dev/null 2>&1
-}
+# see if we already cached the grep alias in past day
+_grep_alias_cache=("$ZSH_CACHE_DIR"/grep_alias.zsh(Nm-24))
+if (( $#_grep_alias_cache )); then
+    source "$ZSH_CACHE_DIR"/grep_alias.zsh
+else
+    # is x grep argument available?
+    grep-flag-available() {
+        echo | grep $1 "" >/dev/null 2>&1
+    }
 
-GREP_OPTIONS=""
+    GREP_OPTIONS=""
 
-# color grep results
-if grep-flag-available --color=auto; then
-    GREP_OPTIONS+=" --color=auto"
-fi
+    # color grep results
+    if grep-flag-available --color=auto; then
+        GREP_OPTIONS+=" --color=auto"
+    fi
 
-# ignore these folders (if the necessary grep flags are available)
-EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
+    # ignore these folders (if the necessary grep flags are available)
+    EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
 
-if grep-flag-available --exclude-dir=.cvs; then
-    GREP_OPTIONS+=" --exclude-dir=$EXC_FOLDERS"
-elif grep-flag-available --exclude=.cvs; then
-    GREP_OPTIONS+=" --exclude=$EXC_FOLDERS"
-fi
+    if grep-flag-available --exclude-dir=.cvs; then
+        GREP_OPTIONS+=" --exclude-dir=$EXC_FOLDERS"
+    elif grep-flag-available --exclude=.cvs; then
+        GREP_OPTIONS+=" --exclude=$EXC_FOLDERS"
+    fi
 
-# export grep, egrep and fgrep settings
-alias grep="grep $GREP_OPTIONS"
-alias egrep="egrep $GREP_OPTIONS"
-alias fgrep="fgrep $GREP_OPTIONS"
+    {
+        # export grep, egrep and fgrep settings
+        echo alias grep="'grep $GREP_OPTIONS'"
+        echo alias egrep="'egrep $GREP_OPTIONS'"
+        echo alias fgrep="'fgrep $GREP_OPTIONS'"
+    } > "$ZSH_CACHE_DIR/grep_alias.zsh"
 
-# clean up
-unset GREP_OPTIONS EXC_FOLDERS
-unfunction grep-flag-available
+    source "$ZSH_CACHE_DIR/grep_alias.zsh"
+
+    # clean up
+    unset GREP_OPTIONS EXC_FOLDERS
+    unfunction grep-flag-available
+fi
+unset _grep_alias_cache