* [PATCH 08/14] mda: hoist out mda_filter_adjust
2019-10-28 10:45 7% [PATCH 00/14] learn: sync w/ -mda changes and add manpage Eric Wong
@ 2019-10-28 10:45 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-10-28 10:45 UTC (permalink / raw)
To: meta
It makes it easier to document the default -mda behavior is
stricter than normal, including "public-inbox-learn ham"
---
script/public-inbox-mda | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 3ff318c9..71c5d937 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -75,13 +75,19 @@ if ($spamc) {
my $mime = PublicInbox::MIME->new(\$str);
do_exit(0) unless $spam_ok;
-my $fcfg = $dst->{filter} || '';
-# -mda defaults to the strict base filter
-if ($fcfg eq '') {
- $dst->{filter} = 'PublicInbox::Filter::Base';
-} elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove?
- $dst->{filter} = 'PublicInbox::Filter::Mirror';
+# -mda defaults to the strict base filter which we won't use anywhere else
+sub mda_filter_adjust ($) {
+ my ($ibx) = @_;
+ my $fcfg = $ibx->{filter} || '';
+ if ($fcfg eq '') {
+ $ibx->{filter} = 'PublicInbox::Filter::Base';
+ } elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove?
+ $ibx->{filter} = 'PublicInbox::Filter::Mirror';
+ }
}
+
+mda_filter_adjust($dst);
+
my $filter = $dst->filter;
my $ret = $filter->delivery($mime);
if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message
^ permalink raw reply related [relevance 6%]
* [PATCH 00/14] learn: sync w/ -mda changes and add manpage
@ 2019-10-28 10:45 7% Eric Wong
2019-10-28 10:45 6% ` [PATCH 08/14] mda: hoist out mda_filter_adjust Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-10-28 10:45 UTC (permalink / raw)
To: meta
What started with adding a manpage for public-inbox-learn,
ended up being a bunch of fixes and improvements to catch
up to -mda changes.
-mda also learned to deal with multiple List-ID headers in the
meantime.
Eric Wong (14):
learn: support multiple To/Cc headers
learn: only map recipient list on "ham" or "rm"
learn: update usage statement
learn: GIT_COMMITTER_<NAME|EMAIL> may be "" or "0"
learn: hoist out remove_or_add subroutine
mda: hoist out List-ID handling and reuse in -learn
filter/base: remove MAX_MID_SIZE constant
mda: hoist out mda_filter_adjust
mda: skip MIME parsing if spam
inboxwritable: add assert_usable_dir sub
mda: prepare for multiple destinations
mda: support multiple List-ID matches
learn: allow running without spamc
doc: add public-inbox-learn(1) manpage
Documentation/include.mk | 1 +
Documentation/public-inbox-learn.pod | 86 +++++++++++++++++++++
MANIFEST | 1 +
lib/PublicInbox/Filter/Base.pm | 1 -
lib/PublicInbox/InboxWritable.pm | 9 ++-
lib/PublicInbox/MDA.pm | 22 ++++++
lib/PublicInbox/V2Writable.pm | 5 +-
script/public-inbox-learn | 84 +++++++++++---------
script/public-inbox-mda | 110 ++++++++++++++++-----------
t/import.t | 8 ++
t/mda.t | 19 +++++
t/v2writable.t | 12 +++
12 files changed, 275 insertions(+), 83 deletions(-)
create mode 100644 Documentation/public-inbox-learn.pod
mode change 100755 => 100644 script/public-inbox-learn
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-10-28 10:45 7% [PATCH 00/14] learn: sync w/ -mda changes and add manpage Eric Wong
2019-10-28 10:45 6% ` [PATCH 08/14] mda: hoist out mda_filter_adjust Eric Wong
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).