From: Stefano Zacchiroli <zack@upsilon.cc>
To: notmuch@notmuchmail.org
Cc: zack@upsilon.cc
Subject: [PATCH 3/3] notmuch-mutt: support for messages that lack Message-ID headers
Date: Sun, 15 Feb 2015 13:39:08 +0100 [thread overview]
Message-ID: <1424003948-17642-4-git-send-email-zack@upsilon.cc> (raw)
In-Reply-To: <1424003948-17642-1-git-send-email-zack@upsilon.cc>
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
---
contrib/notmuch-mutt/README | 4 +++-
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 c661447..9c3379e 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 6d4d60c..126cbf4 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($$$@) {
--
2.1.4
next prev parent reply other threads:[~2015-02-15 12:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-09 9:41 notmuch-mutt: support for messages that lack Message-ID (v2) Stefano Zacchiroli
2015-02-09 9:41 ` [PATCH 1/2] notmuch-mutt README: use metacpn.org/* as deps homepages Stefano Zacchiroli
2015-02-09 9:41 ` [PATCH 2/2] notmuch-mutt: support for messages that lack Message-ID headers Stefano Zacchiroli
2015-02-09 14:31 ` Tomi Ollila
2015-02-15 12:39 ` notmuch-mutt: support for messages that lack Message-ID headers (v3) Stefano Zacchiroli
2015-02-15 12:39 ` [PATCH 1/3] notmuch-mutt: bump copyright year Stefano Zacchiroli
2015-02-15 12:39 ` [PATCH 2/3] notmuch-mutt README: use metacpn.org/* as deps homepages Stefano Zacchiroli
2015-02-15 12:39 ` Stefano Zacchiroli [this message]
2015-02-15 16:46 ` notmuch-mutt: support for messages that lack Message-ID headers (v3) Tomi Ollila
2015-02-16 13:00 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424003948-17642-4-git-send-email-zack@upsilon.cc \
--to=zack@upsilon.cc \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).