lei: use lei->lms in place of lse->lms in a few places

We can golf out some code and refcounts this way.

diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm
index 2d2ff1a0e7f6754a014f8d1d461c06b503253ef1..2ade17aff089cc006f7a114fd0f7d32654e8219f 100644 (file)
--- a/lib/PublicInbox/LeiInspect.pm
+++ b/lib/PublicInbox/LeiInspect.pm
@@ -206,8 +206,7 @@ sub lei_inspect {
 
 sub _complete_inspect {
        my ($lei, @argv) = @_;
-       my $sto = $lei->_lei_store or return;
-       my $lms = $sto->search->lms or return;
+       my $lms = $lei->lms or return;
        my $match_cb = $lei->complete_url_prepare(\@argv);
        map { $match_cb->($_) } $lms->folders;
 }

diff --git a/lib/PublicInbox/LeiPruneMailSync.pm b/lib/PublicInbox/LeiPruneMailSync.pm
index 79f3325df68855127d6eb0b77e31a16b138024d1..98239a139762fe0adbf6e423ba3cfb5a9a5a5e2e 100644 (file)
--- a/lib/PublicInbox/LeiPruneMailSync.pm
+++ b/lib/PublicInbox/LeiPruneMailSync.pm
@@ -40,7 +40,7 @@ sub prune_imap { # lms->each_src callback
 
 sub input_path_url { # overrides PublicInbox::LeiInput::input_path_url
        my ($self, $input, @args) = @_;
-       my $lms = $self->{-lms_ro} //= $self->{lse}->lms;
+       my $lms = $self->{-lms_ro} //= $self->{lei}->lms;
        if ($input =~ /\Amaildir:(.+)/i) {
                my $mdir = $1;
                $lms->each_src($input, \&prune_mdir, $self, $mdir);
@@ -59,24 +59,24 @@ sub lei_prune_mail_sync {
        my $sto = $lei->_lei_store or return $lei->fail(<<EOM);
 lei/store uninitialized, see lei-import(1)
 EOM
-       my $lse = $sto->search;
-       my $lms = $lse->lms or return $lei->fail(<<EOM);
-lei mail_sync uninitialized, see lei-import(1)
-EOM
-       if (defined(my $all = $lei->{opt}->{all})) {
-               $lms->group2folders($lei, $all, \@folders) or return;
+       if (my $lms = $lei->lms) {
+               if (defined(my $all = $lei->{opt}->{all})) {
+                       $lms->group2folders($lei, $all, \@folders) or return;
+               } else {
+                       my $err = $lms->arg2folder($lei, \@folders);
+                       $lei->qerr(@{$err->{qerr}}) if $err->{qerr};
+                       return $lei->fail($err->{fail}) if $err->{fail};
+               }
        } else {
-               my $err = $lms->arg2folder($lei, \@folders);
-               $lei->qerr(@{$err->{qerr}}) if $err->{qerr};
-               return $lei->fail($err->{fail}) if $err->{fail};
+               return $lei->fail(<<EOM);
+lei mail_sync.sqlite3 uninitialized, see lei-import(1)
+EOM
        }
-       delete $lms->{dbh};
        $sto->write_prepare($lei);
-       my $self = bless { lse => $lse }, __PACKAGE__;
+       my $self = bless {}, __PACKAGE__;
        $lei->{opt}->{'mail-sync'} = 1; # for prepare_inputs
        $self->prepare_inputs($lei, \@folders) or return;
        my $j = $lei->{opt}->{jobs} || scalar(@{$self->{inputs}}) || 1;
-       undef $lms; # for fork
        my $ops = {};
        $sto->write_prepare($lei);
        $lei->{auth}->op_merge($ops, $self) if $lei->{auth};