lei q: s/import-augment/import-before/g

Since this importing of keywords is active even when --augment
isn't specified, calling it --import-before seems more
appropriate.

In the future, this will likely default to adding unseen emails
to lei/store, not just updating keywords.

Link: https://public-inbox.org/meta/20210303222930.GA18597@dcvr/T/

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index fdd9f8c86231cb95a6c3e6b4d7a87c5753b791b8..50276a505abbce64a4b1d2cff009d799c9aedead 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -113,7 +113,7 @@ our %CMD = ( # sorted in order of importance/use:
        qw(save-as=s output|mfolder|o=s format|f=s dedupe|d=s threads|t+
        sort|s=s reverse|r offset=i remote! local! external! pretty
        include|I=s@ exclude=s@ only=s@ jobs|j=s globoff|g augment|a
-       import-remote! import-augment! lock=s@
+       import-remote! import-before! lock=s@
        alert=s@ mua=s no-torsocks torsocks=s verbose|v+ quiet|q C=s@),
        PublicInbox::LeiQuery::curl_opt(), opt_dash('limit|n=i', '[0-9]+') ],
 

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index c630d62809a38fa1184cdcb71b7f8cd0e4d87b80..493a83825d2c4e64a1f350ad6ea329b3fc32fb1d 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -52,7 +52,7 @@ sub lei_q {
        my $sto = $self->_lei_store(1);
        my $lse = $sto->search;
        if (($opt->{'import-remote'} //= 1) |
-                       ($opt->{'import-augment'} //= 1)) {
+                       ($opt->{'import-before'} //= 1)) {
                $sto->write_prepare($self);
        }
        if ($opt->{'local'} //= scalar(@only) ? 0 : 1) {

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 6290f35e667da776a7f9bf2a9cdaf0f15d0f59f6..1e2060fe973d129f0ddffec6db17f1fac68e4ce5 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -438,7 +438,7 @@ sub _pre_augment_maildir {
 sub _do_augment_maildir {
        my ($self, $lei) = @_;
        my $dst = $lei->{ovv}->{dst};
-       my $lse = $lei->{sto}->search if $lei->{opt}->{'import-augment'};
+       my $lse = $lei->{sto}->search if $lei->{opt}->{'import-before'};
        my ($mod, $shard) = @{$self->{shard_info} // []};
        if ($lei->{opt}->{augment}) {
                my $dedupe = $lei->{dedupe};
@@ -470,7 +470,7 @@ sub _imap_augment_or_delete { # PublicInbox::NetReader::imap_each cb
 sub _do_augment_imap {
        my ($self, $lei) = @_;
        my $net = $lei->{net};
-       my $lse = $lei->{sto}->search if $lei->{opt}->{'import-augment'};
+       my $lse = $lei->{sto}->search if $lei->{opt}->{'import-before'};
        if ($lei->{opt}->{augment}) {
                my $dedupe = $lei->{dedupe};
                if ($dedupe && $dedupe->prepare_dedupe) {
@@ -511,8 +511,8 @@ sub _pre_augment_mbox {
                die "seek($dst): $!\n";
        }
        if (!$self->{seekable}) {
-               my $ia = $lei->{opt}->{'import-augment'};
-               die "--import-augment specified but $dst is not seekable\n"
+               my $ia = $lei->{opt}->{'import-before'};
+               die "--import-before specified but $dst is not seekable\n"
                        if $ia && !ref($ia);
                die "--augment specified but $dst is not seekable\n" if
                        $lei->{opt}->{augment};
@@ -533,7 +533,7 @@ sub _do_augment_mbox {
        my $out = $lei->{1};
        my ($fmt, $dst) = @{$lei->{ovv}}{qw(fmt dst)};
        return unless -s $out;
-       unless ($opt->{augment} || $opt->{'import-augment'}) {
+       unless ($opt->{augment} || $opt->{'import-before'}) {
                truncate($out, 0) or die "truncate($dst): $!";
                return;
        }
@@ -544,14 +544,14 @@ sub _do_augment_mbox {
                $dedupe = $lei->{dedupe};
                $dedupe->prepare_dedupe if $dedupe;
        }
-       if ($opt->{'import-augment'}) { # the default
+       if ($opt->{'import-before'}) { # the default
                my $lse = $lei->{sto}->search;
                PublicInbox::MboxReader->$fmt($rd, \&_mbox_augment_kw_maybe,
                                                $lei, $lse, $opt->{augment});
                if (!$opt->{augment} and !truncate($out, 0)) {
                        die "truncate($dst): $!";
                }
-       } else { # --augment --no-import-augment
+       } else { # --augment --no-import-before
                PublicInbox::MboxReader->$fmt($rd, \&_augment, $lei);
        }
        # maybe some systems don't honor O_APPEND, Perl does this:
@@ -576,7 +576,7 @@ sub do_augment { # slow, runs in wq worker
 # fast (spawn compressor or mkdir), runs in same process as pre_augment
 sub post_augment {
        my ($self, $lei, @args) = @_;
-       my $wait = $lei->{opt}->{'import-augment'} ?
+       my $wait = $lei->{opt}->{'import-before'} ?
                        $lei->{sto}->ipc_do('checkpoint', 1) : 0;
        # _post_augment_mbox
        my $m = $self->can("_post_augment_$self->{base_type}") or return;

diff --git a/t/lei-q-kw.t b/t/lei-q-kw.t
index babe97497b991bb00f3f4cf23ad380eeaba4b0a4..9daeb5b1976a40c8fb97c1771c247e20ba3f0259 100644 (file)
--- a/t/lei-q-kw.t
+++ b/t/lei-q-kw.t
@@ -23,13 +23,13 @@ lei_ok(qw(q -o), "maildir:$o", qw(m:qp@example.com));
 @fn = glob("$o/cur/*:2,S");
 is(scalar(@fn), 1, "`seen' flag set on Maildir file");
 
-# ensure --no-import-augment works
+# ensure --no-import-before works
 my $n = $fn[0];
 $n =~ s/,S\z/,RS/;
 rename($fn[0], $n) or BAIL_OUT "rename $!";
-lei_ok(qw(q --no-import-augment -o), "maildir:$o",
+lei_ok(qw(q --no-import-before -o), "maildir:$o",
        qw(m:bogus-noresults@example.com));
-ok(!glob("$o/cur/*"), '--no-import-augment cleared destination');
+ok(!glob("$o/cur/*"), '--no-import-before cleared destination');
 lei_ok(qw(q -o), "maildir:$o", qw(m:qp@example.com));
 @fn = glob("$o/cur/*:2,S");
 is(scalar(@fn), 1, "`seen' flag (but not `replied') set on Maildir file");
@@ -39,8 +39,8 @@ SKIP: {
        mkfifo($o, 0600) or skip("mkfifo not supported: $!", 1);
        # cat(1) since lei() may not execve for FD_CLOEXEC to work
        my $cat = popen_rd(['cat', $o]);
-       ok(!lei(qw(q --import-augment bogus -o), "mboxrd:$o"),
-               '--import-augment fails on non-seekable output');
+       ok(!lei(qw(q --import-before bogus -o), "mboxrd:$o"),
+               '--import-before fails on non-seekable output');
        is(do { local $/; <$cat> }, '', 'no output on FIFO');
 };