X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFilter%2FRubyLang.pm;h=62cf5d209f1d0e3624f439d44a53bdb6a65cd2eb;hb=e3b57fe9f68e80fc85cff46ccec9246b670f1312;hp=a43d67a9352e4ea6ab71aad954b3fe44933d55e3;hpb=ddb61e55bc645975063673f346fceb96be7b2d70;p=public-inbox.git

diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index a43d67a9..62cf5d20 100644
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Filter for lists.ruby-lang.org trailers
@@ -16,32 +16,41 @@ sub new {
 	my ($class, %opts) = @_;
 	my $altid = delete $opts{-altid};
 	my $self = $class->SUPER::new(%opts);
-	my $ibx = $self->{-inbox};
+	my $ibx = $self->{ibx};
 	# altid = serial:ruby-core:file=msgmap.sqlite3
 	if (!$altid && $ibx && $ibx->{altid}) {
 		$altid ||= $ibx->{altid}->[0];
 	}
 	if ($altid) {
-		require PublicInbox::MID; # mid_clean
 		require PublicInbox::AltId;
 		$self->{-altid} = PublicInbox::AltId->new($ibx, $altid, 1);
 	}
 	$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;
@@ -50,7 +59,7 @@ sub scrub {
 		my @v = $hdr->header_raw('X-Mail-Count');
 		my $n;
 		foreach (@v) {
-			/\A\s*(\d+)\s*\z/ or next;
+			/\A\s*([0-9]+)\s*\z/ or next;
 			$n = $1;
 			last;
 		}