[PATCH] completion: complete mimetype: search prefix

[PATCH] completion: complete mimetype: search prefix

[Jani Nikula]

Use /etc/mime.types if available, with a homebrew sed parser, and fall
back to a handful of common types otherwise.
---
 completion/notmuch-completion.bash | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 78047b5f424d..c75eb483a9f3 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -58,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 -e '/^[ \t]*\(#.*\)\?$/d;s/^\([^ \t]\+\).*$/\1/' < /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
@@ -85,6 +113,10 @@ _notmuch_search_terms()
 	    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:}) )
+	    ;;
 	*)
 	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod:"
 	    compopt -o nospace
-- 
2.1.4

[PATCH v2] completion: complete mimetype: search prefix

[Jani Nikula]

Use /etc/mime.types if available, with a homebrew sed parser, and fall
back to a handful of common types otherwise.

---

v2: smarter sed thanks to Lucas Hoffmann
---
 completion/notmuch-completion.bash | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 78047b5f424d..e7e7d68b04ed 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -58,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 '/^[^ \t#]/{s/[ \t].*//;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
@@ -85,6 +113,10 @@ _notmuch_search_terms()
 	    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:}) )
+	    ;;
 	*)
 	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod:"
 	    compopt -o nospace
-- 
2.1.4

Re: [PATCH v2] completion: complete mimetype: search prefix

[Tomi Ollila]

Jani Nikula <jani@nikula.org> writes:

> Use /etc/mime.types if available, with a homebrew sed parser, and fall
> back to a handful of common types otherwise.

I'd suggest the following line:

	sed -n '/^[[:alpha:]]/ s/[[:space:]].*//p' /etc/mime.types

I tested the sed expression works on Linux and Darwin (macOS sierra).

I'd guess that any future 'ietf-token' starts with alpha character, and
'x-token' always starts with 'x'.

I agree with Jani that we'd rather used some other solution but so far
using sed(1) looks like best tolerable choice there is.

Tomi

PS: used something like the following to start the emacs to send this email:


  #!/bin/sh
  :; exec "${EMACS:-emacs}" --debug-init --load "$0" "$@"; exit

  (eval-after-load "notmuch"
    (lambda ()
      (setq notmuch-command (concat (file-name-directory load-file-name)
                                    "my-notmuch-remote-command"))
      (setq smtpmail-smtp-server "smtp.gmail.com"
            smtpmail-smtp-service 465
            smtpmail-stream-type 'tls
            smtpmail-debug-info t
            smtpmail-debug-verb t
            message-send-mail-function 'message-smtpmail-send-it)
      ))
  (notmuch)

  ;; Local Variables:
  ;; mode: emacs-lisp
  ;; End:


PPS: first send failed, had to visit

  https://www.google.com/settings/security/lesssecureapps

... it would be nice to know what makes this "less secure" application ...


>  completion/notmuch-completion.bash | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
> index 78047b5f424d..e7e7d68b04ed 100644
> --- a/completion/notmuch-completion.bash
> +++ b/completion/notmuch-completion.bash
> @@ -58,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 '/^[^ \t#]/{s/[ \t].*//;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
> @@ -85,6 +113,10 @@ _notmuch_search_terms()
>  	    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:}) )
> +	    ;;
>  	*)
>  	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod:"
>  	    compopt -o nospace
> -- 
> 2.1.4

Re: [PATCH v2] completion: complete mimetype: search prefix

[Jani Nikula]

On Tue, 25 Oct 2016, Tomi Ollila <domo141@gmail.com> wrote:
> Jani Nikula <jani@nikula.org> writes:
>
>> Use /etc/mime.types if available, with a homebrew sed parser, and fall
>> back to a handful of common types otherwise.
>
> I'd suggest the following line:
>
> 	sed -n '/^[[:alpha:]]/ s/[[:space:]].*//p' /etc/mime.types
>
> I tested the sed expression works on Linux and Darwin (macOS sierra).

$ sed --version
sed (GNU sed) 4.2.2

$ sed -n '/^[[:alpha:]]/ s/[[:space:]].*//p' /etc/mime.types | wc -l
411

$ sed -n '/^[^ \t#]/{s/[ \t].*//;p;}' < /etc/mime.types | wc -l
787


BR,
Jani.

Re: [PATCH v2] completion: complete mimetype: search prefix

[Tomi Ollila]

Jani Nikula <jani@nikula.org> writes:

> On Tue, 25 Oct 2016, Tomi Ollila <domo141@gmail.com> wrote:
>> Jani Nikula <jani@nikula.org> writes:
>>
>>> Use /etc/mime.types if available, with a homebrew sed parser, and fall
>>> back to a handful of common types otherwise.
>>
>> I'd suggest the following line:
>>
>> 	sed -n '/^[[:alpha:]]/ s/[[:space:]].*//p' /etc/mime.types
>>
>> I tested the sed expression works on Linux and Darwin (macOS sierra).
>
> $ sed --version
> sed (GNU sed) 4.2.2
>
> $ sed -n '/^[[:alpha:]]/ s/[[:space:]].*//p' /etc/mime.types | wc -l
> 411
>
> $ sed -n '/^[^ \t#]/{s/[ \t].*//;p;}' < /etc/mime.types | wc -l
> 787

Yes, I failed to notice that lines which did not have any space were
dropped from the output -- and Lucas Hoffmann's version handles that
case neatly (tried some alternatives, none so good (unless 's/\>.*//p')).

  sed -n '/^[[:alpha:]]/{s/[[:space:]].*//;p;}' /etc/mime.types


Now I get the same m5sums from the output of latest 2 in this message,
so now it is more properly tested (sorry about that :)

Tomi

>
> BR,
> Jani.

[PATCH v3] completion: complete mimetype: search prefix

[Jani Nikula]

Use /etc/mime.types if available, parsed using a sed one-liner, and
fall back to a handful of common types otherwise.

---

v2: smarter sed thanks to Lucas Hoffmann

v3: use Tomi's sed... though I'm not sure what the improvement is...
---
 completion/notmuch-completion.bash | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 78047b5f424d..d44b2a2811f0 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -58,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
@@ -85,6 +113,10 @@ _notmuch_search_terms()
 	    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:}) )
+	    ;;
 	*)
 	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod:"
 	    compopt -o nospace
-- 
2.1.4

Re: [PATCH v3] completion: complete mimetype: search prefix

[Tomi Ollila]

On Wed, Nov 02 2016, Jani Nikula <jani@nikula.org> wrote:

> Use /etc/mime.types if available, parsed using a sed one-liner, and
> fall back to a handful of common types otherwise.
>
> ---
>
> v2: smarter sed thanks to Lucas Hoffmann
>
> v3: use Tomi's sed... though I'm not sure what the improvement is...

LGTM.

The difference is that using '\t' is GNU sed extension -- other seds just
consider that being 't' -- Using [[:space:]] works also on macOS, *BSD...

> ---
>  completion/notmuch-completion.bash | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
> index 78047b5f424d..d44b2a2811f0 100644
> --- a/completion/notmuch-completion.bash
> +++ b/completion/notmuch-completion.bash
> @@ -58,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
> @@ -85,6 +113,10 @@ _notmuch_search_terms()
>  	    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:}) )
> +	    ;;
>  	*)
>  	    local search_terms="from: to: subject: attachment: mimetype: tag: id: thread: folder: path: date: lastmod:"
>  	    compopt -o nospace
> -- 
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH v3] completion: complete mimetype: search prefix

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> Use /etc/mime.types if available, parsed using a sed one-liner, and
> fall back to a handful of common types otherwise.
>
> ---

pushed to master