From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 03/13] filter/rubylang: avoid recursing subparts to strip trailers
Date: Thu, 7 May 2020 21:05:46 +0000 [thread overview]
Message-ID: <20200507210556.22995-4-e@yhbt.net> (raw)
In-Reply-To: <20200507210556.22995-1-e@yhbt.net>
Mailman only seems to add trailers (or signatures) as
attachments at the top-level of MIME messages. So don't bother
recursing with ->walk_parts since ->walk_parts is non-trivial to
recreate in the Email::MIME replacement I'm working on.
---
lib/PublicInbox/Filter/RubyLang.pm | 32 ++++++++++++++++++++----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index a65a5971..06e4ea75 100644
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -28,19 +28,29 @@ sub new {
$self;
}
+sub scrub_part ($) {
+ my ($part) = @_;
+ my $ct = $part->content_type;
+ if (!$ct || $ct =~ m{\btext/plain\b}i) {
+ my $s = eval { $part->body_str };
+ if (defined $s && $s =~ s/\n?$l1\n$l2\n\z//os) {
+ $part->body_str_set($s);
+ return 1;
+ }
+ }
+ 0;
+}
+
sub scrub {
my ($self, $mime, $for_remove) = @_;
- # no msg_iter here, that is only for read-only access
- $mime->walk_parts(sub {
- my ($part) = $_[0];
- my $ct = $part->content_type;
- if (!$ct || $ct =~ m{\btext/plain\b}i) {
- my $s = eval { $part->body_str };
- if (defined $s && $s =~ s/\n?$l1\n$l2\n\z//os) {
- $part->body_str_set($s);
- }
- }
- });
+ # no msg_iter here, msg_iter is only for read-only access
+ if (my @sub = $mime->subparts) {
+ my $changed = 0;
+ $changed |= scrub_part($_) for @sub;
+ $mime->parts_set(\@sub) if $changed;
+ } else {
+ scrub_part($mime);
+ }
my $altid = $self->{-altid};
if ($altid && !$for_remove) {
my $hdr = $mime->header_obj;
next prev parent reply other threads:[~2020-05-07 21:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 21:05 [PATCH 00/13] eml: pure-Perl replacement for Email::MIME Eric Wong
2020-05-07 21:05 ` [PATCH 01/13] msg_iter: make ->each_part method for PublicInbox::MIME Eric Wong
2020-05-07 21:05 ` [PATCH 02/13] msg_iter: pass $idx as a scalar, not array Eric Wong
2020-05-07 21:05 ` Eric Wong [this message]
2020-05-07 21:05 ` [PATCH 04/13] smsg: use capitalization for header retrieval Eric Wong
2020-05-07 21:05 ` [PATCH 05/13] eml: pure-Perl replacement for Email::MIME Eric Wong
2020-05-07 21:05 ` [PATCH 06/13] switch read-only Email::Simple users to Eml Eric Wong
2020-05-07 21:05 ` [PATCH 07/13] replace most uses of PublicInbox::MIME with Eml Eric Wong
2020-05-07 21:05 ` [PATCH 08/13] EmlContentFoo: Email::MIME::ContentType replacement Eric Wong
2020-05-07 21:05 ` [PATCH 09/13] EmlContentFoo: relax Encode version requirement Eric Wong
2020-05-07 21:05 ` [PATCH 10/13] eml: remove dependency on Email::MIME::Encodings Eric Wong
2020-05-07 21:05 ` [PATCH 11/13] xt: eml comparison tests Eric Wong
2020-05-08 4:47 ` Eric Wong
2020-05-07 21:05 ` [PATCH 12/13] remove most internal Email::MIME usage Eric Wong
2020-05-07 21:05 ` [PATCH 13/13] eml: drop trailing blank line on missing epilogue 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: http://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=20200507210556.22995-4-e@yhbt.net \
--to=e@yhbt.net \
--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).