diff options
author | Stefano Zacchiroli <zack@upsilon.cc> | 2015-02-15 13:39:08 +0100 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2015-02-16 08:58:13 -0400 |
commit | 1722ea2c95865cb20cc2578894eca2cdaddc1d7a (patch) | |
tree | 0505a492862e8f1df311f47991184038f4cedfdd /contrib | |
parent | 02b554c89616154cbec153cb3938d43d51aae5ad (diff) |
notmuch-mutt: support for messages that lack Message-ID headers
For those messages, compute a synthetic Message-ID based on the SHA1
of the whole message, in the same way that notmuch would do. See:
http://git.notmuchmail.org/git/notmuch/blob/HEAD:/lib/sha1.c
To do the above, rewrite get_message_id() to accumulate header lines,
parse them to check for Message-ID, and fallback to SHA1 computation
if it is not present.
Thanks to:
- Jan N. Klug for preliminary versions of this patch
- Tomi Ollila for suggesting an elegant implementation
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/notmuch-mutt/README | 4 | ||||
-rwxr-xr-x | contrib/notmuch-mutt/notmuch-mutt | 30 |
2 files changed, 28 insertions, 6 deletions
diff --git a/contrib/notmuch-mutt/README b/contrib/notmuch-mutt/README index c6614470..9c3379eb 100644 --- a/contrib/notmuch-mutt/README +++ b/contrib/notmuch-mutt/README @@ -33,9 +33,11 @@ Requirements To *run* notmuch-mutt you will need Perl with the following libraries: +- Digest::SHA <https://metacpan.org/release/Digest-SHA> + (Debian package: libdigest-sha-perl) - Mail::Box <https://metacpan.org/pod/Mail::Box> (Debian package: libmail-box-perl) -- Mail::Internet <https://metacpan.org/pod/Mail::Internet> +- Mail::Header <https://metacpan.org/pod/Mail::Header> (Debian package: libmailtools-perl) - String::ShellQuote <https://metacpan.org/pod/String::ShellQuote> (Debian package: libstring-shellquote-perl) diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt index 6d4d60c7..126cbf44 100755 --- a/contrib/notmuch-mutt/notmuch-mutt +++ b/contrib/notmuch-mutt/notmuch-mutt @@ -13,11 +13,12 @@ use warnings; use File::Path; use Getopt::Long qw(:config no_getopt_compat); -use Mail::Internet; +use Mail::Header; use Mail::Box::Maildir; use Pod::Usage; use String::ShellQuote; use Term::ReadLine; +use Digest::SHA; my $xdg_cache_dir = "$ENV{HOME}/.cache"; @@ -75,10 +76,29 @@ sub prompt($$) { } sub get_message_id() { - my $mail = Mail::Internet->new(\*STDIN); - my $mid = $mail->head->get("message-id") or return undef; - $mid =~ /^<(.*)>$/; # get message-id value - return $1; + my $mid = undef; + my @headers = (); + + while (<STDIN>) { # collect header lines in @headers + push(@headers, $_); + last if $_ =~ /^$/; + } + my $head = Mail::Header->new(\@headers); + $mid = $head->get("message-id") or undef; + + if ($mid) { # Message-ID header found + $mid =~ /^<(.*)>$/; # extract message id + $mid = $1; + } else { # Message-ID header not found, synthesize a message id + # based on SHA1, as notmuch would do. See: + # http://git.notmuchmail.org/git/notmuch/blob/HEAD:/lib/sha1.c + my $sha = Digest::SHA->new(1); + $sha->add($_) foreach(@headers); + $sha->addfile(\*STDIN); + $mid = 'notmuch-sha1-' . $sha->hexdigest; + } + + return $mid; } sub search_action($$$@) { |