* [PATCH 2/2] learn: support --all with `rm'
2020-05-26 9:05 6% [PATCH 0/2] -learn fixes and updates Eric Wong
@ 2020-05-26 9:05 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-05-26 9:05 UTC (permalink / raw)
To: meta
I found myself wanting to remove a message from all inboxes
while working on a test case in another branch. I figure this
could also be useful for globally removing messages which are in
the grey area or too big for spamc.
---
Documentation/public-inbox-learn.pod | 8 ++++++--
script/public-inbox-learn | 9 +++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Documentation/public-inbox-learn.pod b/Documentation/public-inbox-learn.pod
index addcbcb5113..9c6b261b3a5 100644
--- a/Documentation/public-inbox-learn.pod
+++ b/Documentation/public-inbox-learn.pod
@@ -50,8 +50,12 @@ C<publicinboxmda.spamcheck> is C<none> in L<public-inbox-config(5)>.
=item rm
-This is identical to the C<spam> command above, but does
-not feed the message to L<spamc(1)>
+This is similar to the C<spam> command above, but does
+not feed the message to L<spamc(1)> and only removes messages
+which match on any of the C<To:>, C<Cc:>, and C<List-ID:> headers.
+
+The C<--all> option may be used match C<spam> semantics in removing
+the message from all configured inboxes.
=back
diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index 0cb2c8e96e5..5cd08d490bf 100644
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -12,10 +12,15 @@ use PublicInbox::InboxWritable;
use PublicInbox::Eml;
use PublicInbox::Address;
use PublicInbox::Spamcheck::Spamc;
+use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
+my %opt = (all => 0);
+GetOptions(\%opt, 'all') or die "bad command-line args\n";
+
my $train = shift or die "usage: $usage\n";
if ($train !~ /\A(?:ham|spam|rm)\z/) {
die "`$train' not recognized.\nusage: $usage\n";
}
+die "--all only works with `rm'\n" if $opt{all} && $train ne 'rm';
my $spamc = PublicInbox::Spamcheck::Spamc->new;
my $pi_config = PublicInbox::Config->new;
@@ -68,12 +73,12 @@ sub remove_or_add ($$$$) {
}
# spam is removed from all known inboxes since it is often Bcc:-ed
-if ($train eq 'spam') {
+if ($train eq 'spam' || ($train eq 'rm' && $opt{all})) {
$pi_config->each_inbox(sub {
my ($ibx) = @_;
$ibx = PublicInbox::InboxWritable->new($ibx);
my $im = $ibx->importer(0);
- $im->remove($mime, 'spam');
+ $im->remove($mime, $train);
$im->done;
});
} else {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] -learn fixes and updates
@ 2020-05-26 9:05 6% Eric Wong
2020-05-26 9:05 7% ` [PATCH 2/2] learn: support --all with `rm' Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-05-26 9:05 UTC (permalink / raw)
To: meta
I noticed -learn was lacking in some areas while working on
other stuff. Maybe more consistency improvements with other
CLI tools coming...
Eric Wong (2):
learn: fix buggy typo on List-ID mapping
learn: support --all with `rm'
Documentation/public-inbox-learn.pod | 8 ++++++--
script/public-inbox-learn | 11 ++++++++---
t/mda.t | 10 +++++++++-
3 files changed, 23 insertions(+), 6 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-05-26 9:05 6% [PATCH 0/2] -learn fixes and updates Eric Wong
2020-05-26 9:05 7% ` [PATCH 2/2] learn: support --all with `rm' 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).