lei forget-search: support --prune=<local|remote>

[public-inbox.git] / lib / PublicInbox / LeiUp.pm

diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index 4fd0290c76124212376de4ab6b061578b2f88472..79639d5e62a49fe8f2eb43bfd3f454483e619e4f 100644 (file)
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -15,6 +15,14 @@ my $REMOTE_RE = qr!\A(?:imap|http)s?://!i; # http(s) will be for JMAP
 
 sub up1 ($$) {
        my ($lei, $out) = @_;
+       # precedence note for CLI switches between lei q and up:
+       # `lei q --only' > `lei q --no-(remote|local|external)'
+       # `lei up --no-(remote|local|external)' > `lei.q.only' in saved search
+       my %no = map {
+               my $v = $lei->{opt}->{$_}; # set by CLI
+               (defined($v) && !$v) ? ($_ => 1) : ();
+       } qw(remote local external);
+       my $cli_exclude = delete $lei->{opt}->{exclude};
        my $lss = PublicInbox::LeiSavedSearch->up($lei, $out) or return;
        my $f = $lss->{'-f'};
        my $mset_opt = $lei->{mset_opt} = { relevance => -2 };
@@ -31,6 +39,20 @@ sub up1 ($$) {
                my $v = $lss->{-cfg}->get_all("lei.q.$k") // next;
                $lei->{opt}->{$k} //= $v;
        }
+
+       # --no-(local|remote) CLI flags overrided saved `lei.q.only'
+       my $only = $lei->{opt}->{only};
+       @$only = map { $lei->get_externals($_) } @$only if $only;
+       if (scalar keys %no && $only) {
+               @$only = grep(!m!\Ahttps?://!i, @$only) if $no{remote};
+               @$only = grep(m!\Ahttps?://!i, @$only) if $no{'local'};
+       }
+       if ($cli_exclude) {
+               my $ex = $lei->canonicalize_excludes($cli_exclude);
+               @$only = grep { !$ex->{$_} } @$only if $only;
+               push @{$lei->{opt}->{exclude}}, @$cli_exclude;
+       }
+       delete $lei->{opt}->{only} if $no{external} || ($only && !@$only);
        for my $k ($lss->BOOL_FIELDS, $lss->SINGLE_FIELDS) {
                my $v = $lss->{-cfg}->get_1("lei.q.$k") // next;
                $lei->{opt}->{$k} //= $v;
@@ -71,6 +93,21 @@ sub redispatch_all ($$) {
        }
 }
 
+sub filter_lss {
+       my ($self, $lei, $all) = @_;
+       my @outs = PublicInbox::LeiSavedSearch::list($lei);
+       if ($all eq 'local') {
+               $self->{o_local} = [ grep(!/$REMOTE_RE/, @outs) ];
+       } elsif ($all eq 'remote') {
+               $self->{o_remote} = [ grep(/$REMOTE_RE/, @outs) ];
+       } elsif ($all eq '') {
+               $self->{o_remote} = [ grep(/$REMOTE_RE/, @outs) ];
+               $self->{o_local} = [ grep(!/$REMOTE_RE/, @outs) ];
+       } else {
+               undef;
+       }
+}
+
 sub lei_up {
        my ($lei, @outs) = @_;
        my $opt = $lei->{opt};
@@ -79,17 +116,8 @@ sub lei_up {
                return $lei->fail("--all and @outs incompatible") if @outs;
                defined($opt->{mua}) and return
                        $lei->fail('--all and --mua= are incompatible');
-               @outs = PublicInbox::LeiSavedSearch::list($lei);
-               if ($all eq 'local') {
-                       $self->{o_local} = [ grep(!/$REMOTE_RE/, @outs) ];
-               } elsif ($all eq 'remote') {
-                       $self->{o_remote} = [ grep(/$REMOTE_RE/, @outs) ];
-               } elsif ($all eq '') {
-                       $self->{o_remote} = [ grep(/$REMOTE_RE/, @outs) ];
-                       $self->{o_local} = [ grep(!/$REMOTE_RE/, @outs) ];
-               } else {
+               filter_lss($self, $lei, $all) // return
                        $lei->fail("only --all=$all not understood");
-               }
        } elsif ($lei->{lse}) { # redispatched
                scalar(@outs) == 1 or die "BUG: lse set w/ >1 out[@outs]";
                return up1($lei, $outs[0]);
@@ -124,7 +152,7 @@ sub net_merge_all_done {
        $lei->{net} = delete($self->{-net_new}) if $self->{-net_new};
        $self->wq_close;
        eval { redispatch_all($self, $lei) };
-       warn "E: $@" if $@;
+       $lei->child_error(0, "E: $@") if $@;
 }
 
 sub _complete_up { # lei__complete hook