diff options
author | Eric Wong <e@80x24.org> | 2020-12-08 21:21:27 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-12-09 21:13:34 +0000 |
commit | 0d38f65c490466837ae091afa7a7b6f59d04ce7c (patch) | |
tree | 8c838c12ce3c28ef1c15a15dd6584e0d0d831a34 /script | |
parent | 416d1c3f6d5e5a857760ffc1b679e86a070bdbd4 (diff) | |
download | public-inbox-0d38f65c490466837ae091afa7a7b6f59d04ce7c.tar.gz |
{pi_config} may be confused with the documented `PI_CONFIG' environment variable, and we'll favor vowel-removal to be consistent with our usage of object references. The `pi_' prefix may stay in some places, for now; since a separate namespace may come into this codebase for local/private client-tooling. For InboxIdle, we'll also remove an invalid comment about holding a reference to the PublicInbox::Config object, too.
Diffstat (limited to 'script')
-rwxr-xr-x | script/public-inbox-learn | 8 | ||||
-rwxr-xr-x | script/public-inbox-mda | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/script/public-inbox-learn b/script/public-inbox-learn index fb2d86ec..9352c8ff 100755 --- a/script/public-inbox-learn +++ b/script/public-inbox-learn @@ -36,7 +36,7 @@ if ($train !~ /\A(?:ham|spam|rm)\z/) { 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; +my $pi_cfg = PublicInbox::Config->new; my $err; my $mime = PublicInbox::Eml->new(do{ local $/; @@ -87,7 +87,7 @@ sub remove_or_add ($$$$) { # spam is removed from all known inboxes since it is often Bcc:-ed if ($train eq 'spam' || ($train eq 'rm' && $opt{all})) { - $pi_config->each_inbox(sub { + $pi_cfg->each_inbox(sub { my ($ibx) = @_; $ibx = PublicInbox::InboxWritable->new($ibx); my $im = $ibx->importer(0); @@ -102,7 +102,7 @@ if ($train eq 'spam' || ($train eq 'rm' && $opt{all})) { for ($mime->header('Cc'), $mime->header('To')) { foreach my $addr (PublicInbox::Address::emails($_)) { $addr = lc($addr); - $dests{$addr} //= $pi_config->lookup($addr) // 0; + $dests{$addr} //= $pi_cfg->lookup($addr) // 0; } } @@ -113,7 +113,7 @@ if ($train eq 'spam' || ($train eq 'rm' && $opt{all})) { next if $seen{"$ibx"}++; remove_or_add($ibx, $train, $mime, $addr); } - my $dests = PublicInbox::MDA->inboxes_for_list_id($pi_config, $mime); + my $dests = PublicInbox::MDA->inboxes_for_list_id($pi_cfg, $mime); for my $ibx (@$dests) { next if $seen{"$ibx"}++; remove_or_add($ibx, $train, $mime, $ibx->{-primary_address}); diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 3ed5abb6..40963f8e 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -42,18 +42,18 @@ my $str = do { local $/; <STDIN> }; $str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; $ems->prepare(\$str); my $eml = PublicInbox::Eml->new(\$str); -my $config = PublicInbox::Config->new; +my $cfg = PublicInbox::Config->new; my $key = 'publicinboxmda.spamcheck'; my $default = 'PublicInbox::Spamcheck::Spamc'; -my $spamc = PublicInbox::Spamcheck::get($config, $key, $default); +my $spamc = PublicInbox::Spamcheck::get($cfg, $key, $default); my $dests = []; my $recipient = $ENV{ORIGINAL_RECIPIENT}; if (defined $recipient) { - my $ibx = $config->lookup($recipient); # first check + my $ibx = $cfg->lookup($recipient); # first check push @$dests, $ibx if $ibx; } if (!scalar(@$dests)) { - $dests = PublicInbox::MDA->inboxes_for_list_id($config, $eml); + $dests = PublicInbox::MDA->inboxes_for_list_id($cfg, $eml); if (!scalar(@$dests) && !defined($recipient)) { die "ORIGINAL_RECIPIENT not defined in ENV\n"; } |