From 57b178102c0016f5c433054ce981a80dd4b4b73f Mon Sep 17 00:00:00 2001 From: mattmc3 Date: Sat, 30 Nov 2019 13:49:23 -0500 Subject: [PATCH] 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 --- lib/grep.zsh | 63 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/lib/grep.zsh b/lib/grep.zsh index 09042e13b..df9146aa4 100644 --- a/lib/grep.zsh +++ b/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" + # 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}" + + 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 + echo alias grep="'grep $GREP_OPTIONS'" + echo alias egrep="'egrep $GREP_OPTIONS'" + echo alias fgrep="'fgrep $GREP_OPTIONS'" + } > "$ZSH_CACHE_DIR/grep_alias.zsh" + + source "$ZSH_CACHE_DIR/grep_alias.zsh" + + # clean up + unset GREP_OPTIONS EXC_FOLDERS + unfunction grep-flag-available fi - -# 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 - -# export grep, egrep and fgrep settings -alias grep="grep $GREP_OPTIONS" -alias egrep="egrep $GREP_OPTIONS" -alias fgrep="fgrep $GREP_OPTIONS" - -# clean up -unset GREP_OPTIONS EXC_FOLDERS -unfunction grep-flag-available +unset _grep_alias_cache