get rid of unnecessary bytes::length usage

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

diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index 4399c4fba7641a0e4df7933415e207bda203376d..85efd9f5ded69c69341332566d61d2a1f8f6466e 100644 (file)
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -42,12 +42,14 @@ sub up1 ($$) {
        }
        $lei->{lss} = $lss; # for LeiOverview->new
        my $lxs = $lei->lxs_prepare or return;
-       $lei->ale->refresh_externals($lxs);
+       $lei->ale->refresh_externals($lxs, $lei);
        $lei->_start_query;
 }
 
 sub up1_redispatch {
        my ($lei, $out, $op_p) = @_;
+       require PublicInbox::LeiFinmsg;
+       $lei->{fmsg} //= PublicInbox::LeiFinmsg->new($lei->{2});
        my $l = bless { %$lei }, ref($lei);
        $l->{opt} = { %{$l->{opt}} };
        delete $l->{sock};
@@ -57,15 +59,16 @@ sub up1_redispatch {
                up1($l, $out);
                $l->qerr("# $out done");
        };
-       $l->err($@) if $@;
+       $l->child_error(1 << 8, $@) if $@;
 }
 
 sub lei_up {
-       my ($lei, $out) = @_;
+       my ($lei, @outs) = @_;
        $lei->{lse} = $lei->_lei_store(1)->search;
        my $opt = $lei->{opt};
-       $opt->{save} = -1;
+       my @local;
        if (defined $opt->{all}) {
+               return $lei->fail("--all and @outs incompatible") if @outs;
                length($opt->{mua}//'') and return
                        $lei->fail('--all and --mua= are incompatible');
 
@@ -74,26 +77,35 @@ sub lei_up {
                $opt->{all} eq 'local' or return
                        $lei->fail('only --all=local works at the moment');
                my @all = PublicInbox::LeiSavedSearch::list($lei);
-               my @local = grep(!m!\Aimaps?://!i, @all);
+               @local = grep(!m!\Aimaps?://!i, @all);
+       } else {
+               @local = @outs;
+       }
+       if (scalar(@outs) > 1) {
+               length($opt->{mua}//'') and return $lei->fail(<<EOM);
+multiple outputs and --mua= are incompatible
+EOM
+               # TODO:
+               return $lei->fail(<<EOM) if grep(m!\Aimaps?://!i, @outs);
+multiple destinations only supported for local outputs (FIXME)
+EOM
+       }
+       if (scalar(@local) > 1) {
                $lei->_lei_store->write_prepare($lei); # share early
-               if ($lei->{oneshot}) { # synchronous
-                       up1_redispatch($lei, $_) for @local;
-               } else {
-                       # daemon mode, re-dispatch into our event loop w/o
-                       # creating an extra fork-level
-                       require PublicInbox::DS;
-                       require PublicInbox::PktOp;
-                       my ($op_c, $op_p) = PublicInbox::PktOp->pair;
-                       for my $o (@local) {
-                               PublicInbox::DS::requeue(sub {
-                                       up1_redispatch($lei, $o, $op_p);
-                               });
-                       }
-                       $lei->event_step_init;
-                       $op_c->{ops} = { '' => [$lei->can('dclose'), $lei] };
+               # daemon mode, re-dispatch into our event loop w/o
+               # creating an extra fork-level
+               require PublicInbox::DS;
+               require PublicInbox::PktOp;
+               my ($op_c, $op_p) = PublicInbox::PktOp->pair;
+               for my $o (@local) {
+                       PublicInbox::DS::requeue(sub {
+                               up1_redispatch($lei, $o, $op_p);
+                       });
                }
+               $lei->event_step_init;
+               $op_c->{ops} = { '' => [$lei->can('dclose'), $lei] };
        } else {
-               up1($lei, $out);
+               up1($lei, $local[0]);
        }
 }