user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/9] eml: keep body if no headers are found
Date: Tue, 26 Oct 2021 10:35:51 +0000	[thread overview]
Message-ID: <20211026103557.2738-4-e@80x24.org> (raw)
In-Reply-To: <20211026103557.2738-1-e@80x24.org>

This easily allows us to treat "git diff" output as header-less
"messages" for commands such as "lei p2q".
---
 lib/PublicInbox/Eml.pm |  7 ++++---
 t/eml.t                | 11 +++++++++++
 t/mbox_reader.t        |  6 +++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Eml.pm b/lib/PublicInbox/Eml.pm
index 3c681ba5bc2e..485f637a3e7b 100644
--- a/lib/PublicInbox/Eml.pm
+++ b/lib/PublicInbox/Eml.pm
@@ -122,9 +122,10 @@ sub new {
 		my $hdr = substr($$ref, 0, $header_size_limit + 1);
 		hdr_truncate($hdr) if length($hdr) > $header_size_limit;
 		bless { hdr => \$hdr, crlf => $1 }, __PACKAGE__;
-	} else { # nothing useful
-		my $hdr = $$ref = '';
-		bless { hdr => \$hdr, crlf => "\n" }, __PACKAGE__;
+	} else { # just a body w/o header?
+		my $hdr = '';
+		my $eol = ($$ref =~ /(\r?\n)/) ? $1 : "\n";
+		bless { hdr => \$hdr, crlf => $eol, bdy => $ref }, __PACKAGE__;
 	}
 }
 
diff --git a/t/eml.t b/t/eml.t
index 0cf48f225a45..2d8993a51075 100644
--- a/t/eml.t
+++ b/t/eml.t
@@ -216,6 +216,17 @@ if ('one newline before headers') {
 	is($eml->body, "");
 }
 
+if ('body only') {
+	my $str = <<EOM;
+--- a/lib/PublicInbox/Eml.pm
++++ b/lib/PublicInbox/Eml.pm
+@@ -122,9 +122,10 @@ sub new {
+\x20
+EOM
+	my $eml = PublicInbox::Eml->new($str);
+	is($eml->body, $str, 'body-only accepted');
+}
+
 for my $cls (@classes) { # XXX: matching E::M, but not sure about this
 	my $s = <<EOF;
 Content-Type: multipart/mixed; boundary="b"
diff --git a/t/mbox_reader.t b/t/mbox_reader.t
index e5f57d7bcba3..87e8f397662c 100644
--- a/t/mbox_reader.t
+++ b/t/mbox_reader.t
@@ -138,7 +138,11 @@ EOM
 		PublicInbox::MboxReader->$m($fh, sub {
 			push @x, $_[0]->as_string
 		});
-		is_deeply(\@x, [], "messages in invalid $m");
+		if ($m =~ /\Amboxcl/) {
+			is_deeply(\@x, [], "messages in invalid $m");
+		} else {
+			is_deeply(\@x, [ "\n$html" ], "body-only $m");
+		}
 		is_deeply([grep(!/^W: leftover/, @w)], [],
 			"no extra warnings besides leftover ($m)");
 	}

  parent reply	other threads:[~2021-10-26 10:35 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26 10:35 [PATCH 0/9] lei p2q: more capable than originally thought Eric Wong
2021-10-26 10:35 ` [PATCH 1/9] doc: tuning: additional notes for many inboxes Eric Wong
2021-10-26 10:35 ` [PATCH 2/9] doc: lei-store-format: mail sync section, update IPC Eric Wong
2021-10-26 10:35 ` Eric Wong [this message]
2021-10-26 10:35 ` [PATCH 4/9] lei q: enable expensive Xapian flags Eric Wong
2021-10-26 10:35 ` [PATCH 5/9] lei inspect: fix atfork hook Eric Wong
2021-10-26 10:35 ` [PATCH 6/9] lei: add net getopt spec to various commands Eric Wong
2021-10-26 10:35 ` [PATCH 7/9] lei p2q: use LeiInput for multi-patch series Eric Wong
2021-10-26 10:35 ` [PATCH 8/9] lei rm|tag: drop redundant mbox+net callbacks Eric Wong
2021-10-26 10:35 ` [PATCH 9/9] input_pipe: account for undefined {sock} Eric Wong

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://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211026103557.2738-4-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.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://80x24.org/public-inbox.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).