cli: address: Add --filter-by option to configure address filtering

[notmuch.git] / completion / notmuch-completion.bash

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 0571dc9da8e332b3fa3c24ab27e9fa61a3c637f4..5a7199e7ee26075679b40e6d779b409daa641ebd 100644 (file)
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -61,7 +61,7 @@ _notmuch_search_terms()
                sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
            ;;
        *)
-           local search_terms="from: to: subject: attachment: tag: id: thread: folder: path: date:"
+           local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date:"
            compopt -o nospace
            COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )
            ;;
@@ -188,7 +188,10 @@ _notmuch_insert()
     $split &&
     case "${prev}" in
        --folder)
-           _filedir
+           local path=`notmuch config get database.path`
+           compopt -o nospace
+           COMPREPLY=( $(compgen -d "$path/${cur}" | \
+               sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
            return
            ;;
     esac
@@ -196,7 +199,7 @@ _notmuch_insert()
     ! $split &&
     case "${cur}" in
        --*)
-           local options="--create-folder --folder="
+           local options="--create-folder --folder= --keep --no-hooks"
            compopt -o nospace
            COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
            return
@@ -310,7 +313,49 @@ _notmuch_search()
     ! $split &&
     case "${cur}" in
        -*)
-           local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate="
+           local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate= --filter-by="
+           compopt -o nospace
+           COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
+           ;;
+       *)
+           _notmuch_search_terms
+           ;;
+    esac
+}
+
+_notmuch_address()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    $split &&
+    case "${prev}" in
+       --format)
+           COMPREPLY=( $( compgen -W "json sexp text text0" -- "${cur}" ) )
+           return
+           ;;
+       --output)
+           COMPREPLY=( $( compgen -W "sender recipients count" -- "${cur}" ) )
+           return
+           ;;
+       --sort)
+           COMPREPLY=( $( compgen -W "newest-first oldest-first" -- "${cur}" ) )
+           return
+           ;;
+       --exclude)
+           COMPREPLY=( $( compgen -W "true false flag all" -- "${cur}" ) )
+           return
+           ;;
+       --filter-by)
+           COMPREPLY=( $( compgen -W "nameaddr name addr addrfold nameaddrfold" -- "${cur}" ) )
+           return
+           ;;
+    esac
+
+    ! $split &&
+    case "${cur}" in
+       -*)
+           local options="--format= --output= --sort= --exclude="
            compopt -o nospace
            COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
            ;;
@@ -393,7 +438,7 @@ _notmuch_tag()
 
 _notmuch()
 {
-    local _notmuch_commands="compact config count dump help insert new reply restore search setup show tag"
+    local _notmuch_commands="compact config count dump help insert new reply restore search address setup show tag"
     local arg cur prev words cword split
 
     # require bash-completion with _init_completion