X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiExportKw.pm;h=8c5fbc13079eedc83445df7382a3432a3f268ec6;hb=47d4e53734820b4e;hp=b31b065fe4f95fb062650a7218dc048a8f21c122;hpb=6ff03ba2be9247f1ead26c2524fadc789de558f1;p=public-inbox.git diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm index b31b065f..8c5fbc13 100644 --- 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//) { @@ -26,12 +25,11 @@ sub export_kw_md { # LeiMailSync->each_src callback } $bn .= ':2,'. PublicInbox::LeiToMail::kw2suffix([keys %$sto_kw], @$unknown); + return if $bn eq $$id; 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; # we use link(2) + unlink(2) since rename(2) may # inadvertently clobber if the "uniquefilename" part wasn't @@ -42,46 +40,44 @@ sub export_kw_md { # LeiMailSync->each_src callback if (!unlink($src) and $! != ENOENT) { $lei->child_error(1, "E: unlink($src): $!"); } - $lei->{sto}->ipc_do('lms_mv_src', "maildir:$mdir", + $self->{lms}->mv_src("maildir:$mdir", $oidbin, $id, $bn); return; # success anyways if link(2) worked - } - if ($! == ENOENT && !-e $src) { # some other process moved it - $lei->{sto}->ipc_do('lms_clear_src', - "maildir:$mdir", $id); - next; - } - push @fail, $src if $! != EEXIST; + } elsif ($! == EEXIST) { # lost race with lei/store? + return; + } elsif ($! != ENOENT) { + $lei->child_error(1, "E: link($src -> $dst): $!"); + } # else loop @try } - return unless @fail; - # both tries failed my $e = $!; - my $orig = '['.join('|', @fail).']'; - $lei->child_error(1, "link($orig, $dst) ($oidhex): $e"); + # both tries failed + my $oidhex = unpack('H*', $oidbin); + my $src = "$mdir/{".join(',', @try)."}/$$id"; + $lei->child_error(1, "link($src -> $dst) ($oidhex): $e"); + for (@try) { return if -e "$mdir/$_/$$id" } + $self->{lms}->clear_src("maildir:$mdir", $id); } 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_ro} //= $self->{lse}->lms; + $self->{lms}->lms_write_prepare; if ($input =~ /\Amaildir:(.+)/i) { my $mdir = $1; require PublicInbox::LeiToMail; # kw2suffix - $lms->each_src($input, \&export_kw_md, $self, $mdir); + $self->{lms}->each_src($input, \&export_kw_md, $self, $mdir); } elsif ($input =~ m!\Aimaps?://!i) { my $uri = PublicInbox::URIimap->new($input); my $mic = $self->{nwr}->mic_for_folder($uri); - $lms->each_src($$uri, \&export_kw_imap, $self, $mic); + $self->{lms}->each_src($$uri, \&export_kw_imap, $self, $mic); $mic->expunge; } else { die "BUG: $input not supported" } - my $wait = $self->{lei}->{sto}->ipc_do('done'); } sub lei_export_kw { @@ -89,54 +85,25 @@ sub lei_export_kw { my $sto = $lei->_lei_store or return $lei->fail(<search; - my $lms = $lse->lms or return $lei->fail(<lms or return $lei->fail(<{opt}; - my $all = $opt->{all}; - if (defined $all) { # --all= - 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(<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(<{opt}->{all})) { # --all= + $lms->group2folders($lei, $all, \@folders) or return; + @folders = grep(/\A(?:maildir|imaps?):/i, @folders); } else { my $err = $lms->arg2folder($lei, \@folders); $lei->qerr(@{$err->{qerr}}) if $err->{qerr}; return $lei->fail($err->{fail}) if $err->{fail}; } - my $self = bless { lse => $lse }, __PACKAGE__; + $lms->lms_pause; + my $self = bless { lse => $sto->search, lms => $lms }, __PACKAGE__; $lei->{opt}->{'mail-sync'} = 1; # for prepare_inputs $self->prepare_inputs($lei, \@folders) or return; - my $j = $opt->{jobs} // scalar(@{$self->{inputs}}) || 1; if (my @ro = grep(!/\A(?:maildir|imaps?):/i, @folders)) { return $lei->fail("cannot export to read-only folders: @ro"); } - my $m = $opt->{mode} // 'merge'; + my $m = $lei->{opt}->{mode} // 'merge'; if ($m eq 'merge') { # default $self->{-merge_kw} = 1; } elsif ($m eq 'set') { @@ -151,22 +118,18 @@ EOM $self->{imap_mod_kw} = $net->can($self->{-merge_kw} ? 'imap_add_kw' : 'imap_set_kw'); } - 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); + (my $op_c, $ops) = $lei->workers_start($self, 1, $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 { 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; } @@ -176,7 +139,4 @@ no warnings 'once'; *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -# the following works even when LeiAuth is lazy-loaded -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; - 1;