From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6B16B20189 for ; Fri, 17 Jun 2016 00:41:31 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] filter: split out scrub method from delivery Date: Fri, 17 Jun 2016 00:41:27 +0000 Message-Id: <20160617004128.1037-2-e@80x24.org> In-Reply-To: <20160617004128.1037-1-e@80x24.org> References: <20160617004128.1037-1-e@80x24.org> List-Id: We will scrub for importing archives, so ensure it is usable outside of the delivery routine. --- lib/PublicInbox/Filter/Base.pm | 9 ++++++++- lib/PublicInbox/Filter/Vger.pm | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Filter/Base.pm b/lib/PublicInbox/Filter/Base.pm index 0991e87..37f1ee7 100644 --- a/lib/PublicInbox/Filter/Base.pm +++ b/lib/PublicInbox/Filter/Base.pm @@ -62,6 +62,13 @@ sub reject ($$) { sub err ($) { $_[0]->{err} } +# by default, scrub is a no-op, see PublicInbox::Filter::Vger::scrub +# for an example of the override +sub scrub { + my ($self, $mime) = @_; + $self->ACCEPT($mime); +} + # for MDA sub delivery { my ($self, $mime) = @_; @@ -94,7 +101,7 @@ sub delivery { push @r, 'Rejected suffixes(s): '.join(', ', sort keys %sfx); } - @r ? $self->reject(join("\n", @r)) : $self->ACCEPT; + @r ? $self->reject(join("\n", @r)) : $self->scrub($mime); } 1; diff --git a/lib/PublicInbox/Filter/Vger.pm b/lib/PublicInbox/Filter/Vger.pm index 9498081..2ffed18 100644 --- a/lib/PublicInbox/Filter/Vger.pm +++ b/lib/PublicInbox/Filter/Vger.pm @@ -17,7 +17,7 @@ my $l3 = # only LKML had this, and LKML nowadays has no list trailer since Jan 2016 my $l4 = qr!Please read the FAQ at +http://www\.tux\.org/lkml/!; -sub delivery { +sub scrub { my ($self, $mime) = @_; my $s = $mime->as_string; @@ -30,4 +30,9 @@ sub delivery { $self->ACCEPT($mime); } +sub delivery { + my ($self, $mime) = @_; + $self->scrub($mime); +} + 1;