get rid of unnecessary bytes::length usage

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

diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm
index 92c3aa43e7e83b4524c0d477d8385bc9b51da4b7..42a5ff2269d0a16a2875ccc0c9188c08ea4d4b8f 100644 (file)
--- a/lib/PublicInbox/LeiExportKw.pm
+++ b/lib/PublicInbox/LeiExportKw.pm
@@ -10,8 +10,7 @@ use Errno qw(EEXIST ENOENT);
 
 sub export_kw_md { # LeiMailSync->each_src callback
        my ($oidbin, $id, $self, $mdir) = @_;
-       my $oidhex = unpack('H*', $oidbin);
-       my $sto_kw = $self->{lse}->oid_keywords($oidhex) or return;
+       my $sto_kw = $self->{lse}->oidbin_keywords($oidbin) or return;
        my $bn = $$id;
        my ($md_kw, $unknown, @try);
        if ($bn =~ s/:2,([a-zA-Z]*)\z//) {
@@ -28,6 +27,7 @@ sub export_kw_md { # LeiMailSync->each_src callback
                PublicInbox::LeiToMail::kw2suffix([keys %$sto_kw], @$unknown);
        my $dst = "$mdir/cur/$bn";
        my @fail;
+       my $lei = $self->{lei};
        for my $d (@try) {
                my $src = "$mdir/$d/$$id";
                next if $src eq $dst;
@@ -39,15 +39,15 @@ sub export_kw_md { # LeiMailSync->each_src callback
                        # unlink(2) may ENOENT from parallel invocation,
                        # ignore it, but not other serious errors
                        if (!unlink($src) and $! != ENOENT) {
-                               $self->{lei}->child_error(1,
-                                                       "E: unlink($src): $!");
+                               $lei->child_error(1, "E: unlink($src): $!");
                        }
-                       $self->{lms}->mv_src("maildir:$mdir",
-                                               $oidbin, $id, $bn) or die;
+                       $lei->{sto}->ipc_do('lms_mv_src', "maildir:$mdir",
+                                               $oidbin, $id, $bn);
                        return; # success anyways if link(2) worked
                }
                if ($! == ENOENT && !-e $src) { # some other process moved it
-                       $self->{lms}->clear_src("maildir:$mdir", $id);
+                       $lei->{sto}->ipc_do('lms_clear_src',
+                                               "maildir:$mdir", $id);
                        next;
                }
                push @fail, $src if $! != EEXIST;
@@ -56,21 +56,20 @@ sub export_kw_md { # LeiMailSync->each_src callback
        # both tries failed
        my $e = $!;
        my $orig = '['.join('|', @fail).']';
-       $self->{lei}->child_error(1, "link($orig, $dst) ($oidhex): $e");
+       my $oidhex = unpack('H*', $oidbin);
+       $lei->child_error(1, "link($orig, $dst) ($oidhex): $e");
 }
 
 sub export_kw_imap { # LeiMailSync->each_src callback
        my ($oidbin, $id, $self, $mic) = @_;
-       my $oidhex = unpack('H*', $oidbin);
-       my $sto_kw = $self->{lse}->oid_keywords($oidhex) or return;
+       my $sto_kw = $self->{lse}->oidbin_keywords($oidbin) or return;
        $self->{imap_mod_kw}->($self->{nwr}, $mic, $id, [ keys %$sto_kw ]);
 }
 
 # overrides PublicInbox::LeiInput::input_path_url
 sub input_path_url {
        my ($self, $input, @args) = @_;
-       my $lms = $self->{lms} //= $self->{lse}->lms;
-       $lms->lms_begin;
+       my $lms = $self->{-lms_ro} //= $self->{lse}->lms;
        if ($input =~ /\Amaildir:(.+)/i) {
                my $mdir = $1;
                require PublicInbox::LeiToMail; # kw2suffix
@@ -81,7 +80,7 @@ sub input_path_url {
                $lms->each_src($$uri, \&export_kw_imap, $self, $mic);
                $mic->expunge;
        } else { die "BUG: $input not supported" }
-       $lms->lms_commit;
+       my $wait = $self->{lei}->{sto}->ipc_do('done');
 }
 
 sub lei_export_kw {
@@ -94,36 +93,8 @@ EOM
 lei mail_sync uninitialized, see lei-import(1)
 EOM
        my $opt = $lei->{opt};
-       my $all = $opt->{all};
-       if (defined $all) { # --all=<local|remote>
-               my %x = map { $_ => $_ } split(/,/, $all);
-               my @ok = grep(defined, delete(@x{qw(local remote), ''}));
-               my @no = keys %x;
-               if (@no) {
-                       @no = (join(',', @no));
-                       return $lei->fail(<<EOM);
---all=@no not accepted (must be `local' and/or `remote')
-EOM
-               }
-               my (%seen, @inc);
-               my @all = $lms->folders;
-               for my $ok (@ok) {
-                       if ($ok eq 'local') {
-                               @inc = grep(!m!\A[a-z0-9\+]+://!i, @all);
-                       } elsif ($ok eq 'remote') {
-                               @inc = grep(m!\A[a-z0-9\+]+://!i, @all);
-                       } elsif ($ok ne '') {
-                               return $lei->fail("--all=$all not understood");
-                       } else {
-                               @inc = @all;
-                       }
-                       for (@inc) {
-                               push(@folders, $_) unless $seen{$_}++;
-                       }
-               }
-               return $lei->fail(<<EOM) if !@folders;
-no --mail-sync folders known to lei
-EOM
+       if (defined(my $all = $opt->{all})) { # --all=<local|remote>
+               $lms->group2folders($lei, $all, \@folders) or return;
        } else {
                my $err = $lms->arg2folder($lei, \@folders);
                $lei->qerr(@{$err->{qerr}}) if $err->{qerr};
@@ -151,15 +122,16 @@ EOM
                $self->{imap_mod_kw} = $net->can($self->{-merge_kw} ?
                                        'imap_add_kw' : 'imap_set_kw');
        }
-       undef $lms;
+       undef $lms; # for fork
        my $ops = {};
+       $sto->write_prepare($lei);
        $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
        $self->{-wq_nr_workers} = $j // 1; # locked
        (my $op_c, $ops) = $lei->workers_start($self, $j, $ops);
        $lei->{wq1} = $self;
        $lei->{-err_type} = 'non-fatal';
        net_merge_all_done($self) unless $lei->{auth};
-       $op_c->op_wait_event($ops); # calls net_merge_all_done if $lei->{auth}
+       $lei->wait_wq_events($op_c, $ops); # net_merge_all_done if !{auth}
 }
 
 sub _complete_export_kw {