23782: commands with descriptions.

This commit is contained in:
Clint Adams 2007-08-19 23:04:07 +00:00
parent 1380ae67c2
commit 4e945291a2
2 changed files with 80 additions and 0 deletions

View File

@ -1,5 +1,8 @@
2007-08-19 Clint Adams <clint@zsh.org>
* R.Ramkumar, tweaked: 23782: Completion/Unix/Type/_path_commands:
commands with descriptions.
* 23781: Completion/Debian/Command/_dput: base host completion
on output of `dput -H`.

View File

@ -0,0 +1,77 @@
#autoload
(( $+functions[_path_commands_caching_policy] )) ||
_path_commands_caching_policy() {
local oldp file
typeset -a dbfiles
# rebuild if cache is more than a week old
oldp=( "$1"(Nmw+1) )
(( $#oldp )) && return 0
dbfiles=(/usr/share/man/index.(bt|db|dir|pag)(N) \
/usr/man/index.(bt|db|dir|pag)(N) \
/var/cache/man/index.(bt|db|dir|pag)(N) \
/var/catman/index.(bt|db|dir|pag)(N) \
/usr/share/man/*/whatis(N))
for file in $dbfiles; do
[[ $file -nt $1 ]] && return 0
done
return 1
}
_path_commands() {
local need_desc expl ret=1
if zstyle -T ":completion:${curcontext}:" verbose; then
local update_policy first
if [[ $+_command_descriptions -eq 0 ]]; then
first=yes
typeset -A -g _command_descriptions
fi
zstyle -s ":completion:${curcontext}:" cache-policy update_policy
[[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" \
cache-policy _path_commands_caching_policy
if ( [[ -n $first ]] || _cache_invalid command-descriptions ) && \
! _retrieve_cache command-descriptions; then
local line
for line in "${(f)$(_call_program command-descriptions whatis -s 1 -r .\\\*\; whatis -s 6 -r .\\\* 2> /dev/null)}"; do
[[ -n ${line:#(#b)([^ ]#) #\([^ ]#\)( #\[[^ ]#\]|)[ -]#(*)} ]] && continue;
[[ -z $match[1] || -z $match[3] || -z ${${match[1]}:#*:*} ]] && continue;
_command_descriptions[$match[1]]=$match[3]
done
_store_cache command-descriptions _command_descriptions
fi
(( $#_command_descriptions )) && need_desc=yes
fi
if [[ -n $need_desc ]]; then
typeset -a dcmds descs cmds
local desc cmd sep
for cmd in ${(@)commands[(I)$PREFIX*]}; do
desc=$_command_descriptions[$cmd]
if [[ -z $desc ]]; then
cmds+=$cmd
else
dcmds+=$cmd
descs+="$cmd:$desc"
fi
done
zstyle -s ":completion:${curcontext}:" list-separator sep || sep=--
zformat -a descs " $sep " $descs
descs=("${(@r:COLUMNS-1:)descs}")
_wanted commands expl 'external command' \
compadd "$@" -ld descs -a dcmds && ret=0
_wanted commands expl 'external command' compadd "$@" -a cmds && ret=0
else
_wanted commands expl 'external command' compadd "$@" -k commands && ret=0
fi
return $ret
}
_path_commands "$@"