X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=completion%2Fnotmuch-completion.bash;h=15425697a215290e79a4d58e7cdf4884f3a5f2bc;hp=1552c1e51db7403aba3d791dce045317f846f9c0;hb=HEAD;hpb=326824aee38c64ce80c50feac92c10dba4bb4879

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 1552c1e5..3748846e 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -3,7 +3,7 @@
 # Copyright © 2013 Jani Nikula
 #
 # Based on the bash-completion package:
-# http://bash-completion.alioth.debian.org/
+# https://github.com/scop/bash-completion
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 #
 # Author: Jani Nikula <jani@nikula.org>
 #
@@ -27,6 +27,8 @@
 # on completion.
 #
 
+_notmuch_shared_options="--help --uuid= --version"
+
 # $1: current input of the form prefix:partialinput, where prefix is
 # to or from.
 _notmuch_email()
@@ -56,6 +58,34 @@ _notmuch_email()
 	sed 's/[^<]*<\([^>]*\)>/\1/' | tr "[:upper:]" "[:lower:]" | sort -u
 }
 
+_notmuch_mimetype()
+{
+    # use mime types from mime-support package if available, and fall
+    # back to a handful of common ones otherwise
+    if [ -r "/etc/mime.types" ]; then
+	sed -n '/^[[:alpha:]]/{s/[[:space:]].*//;p;}' /etc/mime.types
+    else
+	cat <<EOF
+application/gzip
+application/msword
+application/pdf
+application/zip
+audio/mpeg
+audio/ogg
+image/gif
+image/jpeg
+image/png
+message/rfc822
+text/calendar
+text/html
+text/plain
+text/vcard
+text/x-diff
+text/x-vcalendar
+EOF
+    fi
+}
+
 _notmuch_search_terms()
 {
     local cur prev words cword split
@@ -73,18 +103,26 @@ _notmuch_search_terms()
 	    COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_email ${cur}`" -- ${cur##from:}) )
 	    ;;
 	path:*)
-	    local path=`notmuch config get database.path`
+	    local path=`notmuch config get database.mail_root`
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -d "$path/${cur##path:}" | sed "s|^$path/||" ) )
 	    ;;
 	folder:*)
-	    local path=`notmuch config get database.path`
+	    local path=`notmuch config get database.mail_root`
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
 		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
 	    ;;
+	mimetype:*)
+	    compopt -o nospace
+	    COMPREPLY=( $(compgen -P "mimetype:" -W "`_notmuch_mimetype ${cur}`" -- ${cur##mimetype:}) )
+	    ;;
+	query:*)
+	    compopt -o nospace
+	    COMPREPLY=( $(compgen -P "query:" -W "`notmuch config list | sed -n '/^query\./s/^query\.\([^=]*\)=.*/\1/p'`" -- ${cur##query:}) )
+	    ;;
 	*)
-	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date:"
+	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod: query: property:"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )
 	    ;;
@@ -109,7 +147,7 @@ _notmuch_compact()
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--backup= --quiet"
+	    local options="--backup= --quiet ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -162,7 +200,7 @@ _notmuch_count()
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--output= --exclude= --batch --input= --lastmod"
+	    local options="--output= --exclude= --batch --input= --lastmod ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -192,7 +230,7 @@ _notmuch_dump()
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--gzip --format= --output="
+	    local options="--gzip --format= --output= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -202,6 +240,38 @@ _notmuch_dump()
     esac
 }
 
+_notmuch_emacs_mua()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    $split &&
+    case "${prev}" in
+	--to|--cc|--bcc)
+	    COMPREPLY=( $(compgen -W "`_notmuch_email to:${cur}`" -- ${cur}) )
+	    return
+	    ;;
+	--body)
+	    _filedir
+	    return
+	    ;;
+    esac
+
+    ! $split &&
+    case "${cur}" in
+        -*)
+	    local options="--subject= --to= --cc= --bcc= --body= --no-window-system --client --auto-daemon --create-frame --print --help --hello"
+
+	    compopt -o nospace
+	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
+	    ;;
+	*)
+	    COMPREPLY=( $(compgen -W "`_notmuch_email to:${cur}`" -- ${cur}) )
+	    return
+	    ;;
+    esac
+}
+
 _notmuch_insert()
 {
     local cur prev words cword split
@@ -211,18 +281,22 @@ _notmuch_insert()
     $split &&
     case "${prev}" in
 	--folder)
-	    local path=`notmuch config get database.path`
+	    local path=`notmuch config get database.mail_root`
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -d "$path/${cur}" | \
 		sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
 	    return
 	    ;;
+	--decrypt)
+	    COMPREPLY=( $( compgen -W "true false auto nostash" -- "${cur}" ) )
+	    return
+	    ;;
     esac
 
     ! $split &&
     case "${cur}" in
 	--*)
-	    local options="--create-folder --folder= --keep --no-hooks"
+	    local options="--create-folder --folder= --keep --no-hooks --decrypt= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    return
@@ -241,11 +315,21 @@ _notmuch_insert()
 _notmuch_new()
 {
     local cur prev words cword split
-    _init_completion || return
+    _init_completion -s || return
 
+    $split &&
+    case "${prev}" in
+	--decrypt)
+	    COMPREPLY=( $( compgen -W "true false auto nostash" -- "${cur}" ) )
+	    return
+	    ;;
+    esac
+
+    ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--no-hooks --quiet"
+	    local options="--no-hooks --decrypt= --quiet ${_notmuch_shared_options}"
+	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "${options}" -- ${cur}) )
 	    ;;
     esac
@@ -266,12 +350,16 @@ _notmuch_reply()
 	    COMPREPLY=( $( compgen -W "all sender" -- "${cur}" ) )
 	    return
 	    ;;
+	--decrypt)
+	    COMPREPLY=( $( compgen -W "true auto false" -- "${cur}" ) )
+	    return
+	    ;;
     esac
 
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--format= --format-version= --reply-to= --decrypt"
+	    local options="--format= --format-version= --reply-to= --decrypt= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -301,7 +389,7 @@ _notmuch_restore()
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--format= --accumulate --input="
+	    local options="--format= --accumulate --input= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -336,7 +424,33 @@ _notmuch_search()
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate="
+	    local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate= ${_notmuch_shared_options}"
+	    compopt -o nospace
+	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
+	    ;;
+	*)
+	    _notmuch_search_terms
+	    ;;
+    esac
+}
+
+_notmuch_reindex()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    $split &&
+    case "${prev}" in
+	--decrypt)
+	    COMPREPLY=( $( compgen -W "true false auto nostash" -- "${cur}" ) )
+	    return
+	    ;;
+    esac
+
+    ! $split &&
+    case "${cur}" in
+	-*)
+	    local options="--decrypt= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -358,7 +472,7 @@ _notmuch_address()
 	    return
 	    ;;
 	--output)
-	    COMPREPLY=( $( compgen -W "sender recipients count" -- "${cur}" ) )
+	    COMPREPLY=( $( compgen -W "sender recipients count address" -- "${cur}" ) )
 	    return
 	    ;;
 	--sort)
@@ -378,7 +492,7 @@ _notmuch_address()
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--format= --output= --sort= --exclude= --deduplicate="
+	    local options="--format= --output= --sort= --exclude= --deduplicate= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -407,12 +521,16 @@ _notmuch_show()
 	    COMPREPLY=( $( compgen -W "true false" -- "${cur}" ) )
 	    return
 	    ;;
+        --decrypt)
+	    COMPREPLY=( $( compgen -W "true auto false stash" -- "${cur}" ) )
+	    return
+	    ;;
     esac
 
     ! $split &&
     case "${cur}" in
 	-*)
-	    local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html"
+	    local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt= --include-html --limit= --offset= ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    ;;
@@ -439,7 +557,7 @@ _notmuch_tag()
     ! $split &&
     case "${cur}" in
 	--*)
-	    local options="--batch --input= --remove-all"
+	    local options="--batch --input= --remove-all ${_notmuch_shared_options}"
 	    compopt -o nospace
 	    COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
 	    return
@@ -461,7 +579,7 @@ _notmuch_tag()
 
 _notmuch()
 {
-    local _notmuch_commands="compact config count dump help insert new reply restore search address setup show tag"
+    local _notmuch_commands="compact config count dump help insert new reply restore reindex search address setup show tag emacs-mua"
     local arg cur prev words cword split
 
     # require bash-completion with _init_completion
@@ -481,14 +599,19 @@ _notmuch()
 
     if [ -z "${arg}" ]; then
 	# top level completion
-	local top_options="--help --version"
 	case "${cur}" in
-	    -*) COMPREPLY=( $(compgen -W "${top_options}" -- ${cur}) ) ;;
-	    *) COMPREPLY=( $(compgen -W "${_notmuch_commands}" -- ${cur}) ) ;;
+	    -*)
+		# XXX: handle ${_notmuch_shared_options} and --config=
+		local options="--help --version"
+		COMPREPLY=( $(compgen -W "${options}" -- ${cur}) )
+		;;
+	    *)
+		COMPREPLY=( $(compgen -W "${_notmuch_commands}" -- ${cur}) )
+		;;
 	esac
     elif [ "${arg}" = "help" ]; then
 	# handle help command specially due to _notmuch_commands usage
-	local help_topics="$_notmuch_commands hooks search-terms"
+	local help_topics="$_notmuch_commands hooks search-terms properties"
 	COMPREPLY=( $(compgen -W "${help_topics}" -- ${cur}) )
     else
 	# complete using _notmuch_subcommand if one exist