completion: add proper completion of folder: and path:

Complete folder: to maildir folders and path: to directories in mail
store.

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 0f132043dea5e89219f6853714b63c74ac101476..59f1a3ea643123ccb2ef7fe2034dac28ae8f3dc2 100644 (file)
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -49,8 +49,19 @@ _notmuch_search_terms()
        from:*)
            COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_user_emails`" -- ${cur##from:}) )
            ;;
        from:*)
            COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_user_emails`" -- ${cur##from:}) )
            ;;

+       path:*)
+           local path=`notmuch config get database.path`
+           compopt -o nospace
+           COMPREPLY=( $(compgen -d "$path/${cur##path:}" | sed "s|^$path/||" ) )
+           ;;
+       folder:*)
+           local path=`notmuch config get database.path`
+           compopt -o nospace
+           COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \
+               sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) )
+           ;;

        *)
        *)

-           local search_terms="from: to: subject: attachment: tag: id: thread: folder: date:"
+           local search_terms="from: to: subject: attachment: tag: id: thread: folder: path: date:"

            compopt -o nospace
            COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )
            ;;
            compopt -o nospace
            COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) )
            ;;