X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiImport.pm;h=b9865829e39d6e7f5c7131ee772f99d13e74928a;hp=9da6b7f939dd62b49830020878312958fc2f70ff;hb=961690bae47c90a4a6960952587c6f4463fb4b19;hpb=97caa1fe259cd6904573f36e0ac078a269b6ec5f diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 9da6b7f9..b9865829 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # front-end for the "lei import" sub-command @@ -6,13 +6,17 @@ package PublicInbox::LeiImport; use strict; use v5.10.1; use parent qw(PublicInbox::IPC PublicInbox::LeiInput); +use PublicInbox::InboxWritable qw(eml_from_path); # /^input_/ subs are used by (or override) PublicInbox::LeiInput superclass sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh my ($self, $eml, $vmd) = @_; my $xoids = $self->{lei}->{ale}->xoids_for($eml); - $self->{lei}->{sto}->ipc_do('set_eml', $eml, $vmd, $xoids); + if (my $all_vmd = $self->{all_vmd}) { + @$vmd{keys %$all_vmd} = values %$all_vmd; + } + $self->{lei}->{sto}->wq_do('set_eml', $eml, $vmd, $xoids); } sub input_mbox_cb { # MboxReader callback @@ -25,67 +29,106 @@ sub input_mbox_cb { # MboxReader callback input_eml_cb($self, $eml, $vmd); } -sub input_maildir_cb { # maildir_each_eml cb - my ($f, $kw, $eml, $self) = @_; - input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef); -} - -sub input_net_cb { # imap_each, nntp_each cb - my ($url, $uid, $kw, $eml, $self) = @_; - input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef); -} - -sub import_done_wait { # dwaitpid callback - my ($arg, $pid) = @_; - my ($imp, $lei) = @$arg; - $lei->child_error($?, 'non-fatal errors during import') if $?; - my $sto = delete $lei->{sto}; - my $wait = $sto->ipc_do('done') if $sto; # PublicInbox::LeiStore::done - $lei->dclose; -} - -sub import_done { # EOF callback for main daemon - my ($lei) = @_; - my $imp = delete $lei->{imp} or return; - $imp->wq_wait_old(\&import_done_wait, $lei); +sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn + my ($self, $f, $fl) = @_; + my ($folder, $bn) = ($f =~ m!\A(.+?)/(?:new|cur)/([^/]+)\z!) or + die "BUG: $f was not from a Maildir?\n"; + my $kw = PublicInbox::MdirReader::flags2kw($fl); + substr($folder, 0, 0) = 'maildir:'; # add prefix + my $lse = $self->{lse} //= $self->{lei}->{sto}->search; + my $lms = $self->{-lms_rw} //= $self->{lei}->lms; # may be 0 or undef + my @oidbin = $lms ? $lms->name_oidbin($folder, $bn) : (); + @oidbin > 1 and warn("W: $folder/*/$$bn not unique:\n", + map { "\t".unpack('H*', $_)."\n" } @oidbin); + my %seen; + my @docids = sort { $a <=> $b } grep { !$seen{$_}++ } + map { $lse->over->oidbin_exists($_) } @oidbin; + my $vmd = $self->{-import_kw} ? { kw => $kw } : undef; + if (scalar @docids) { + $lse->kw_changed(undef, $kw, \@docids) or return; + } + if (my $eml = eml_from_path($f)) { + $vmd->{sync_info} = [ $folder, \$bn ] if $self->{-mail_sync}; + $self->input_eml_cb($eml, $vmd); + } } -sub net_merge_complete { # callback used by LeiAuth - my ($self) = @_; - for my $input (@{$self->{inputs}}) { - $self->wq_io_do('input_path_url', [], $input); +sub input_net_cb { # imap_each / nntp_each + my ($uri, $uid, $kw, $eml, $self) = @_; + if (defined $eml) { + my $vmd = $self->{-import_kw} ? { kw => $kw } : undef; + $vmd->{sync_info} = [ $$uri, $uid ] if $self->{-mail_sync}; + $self->input_eml_cb($eml, $vmd); + } elsif (my $ikw = $self->{lei}->{ikw}) { # old message, kw only + # we send $uri as a bare SCALAR and not a URIimap ref to + # reduce socket traffic: + $ikw->wq_io_do('ck_update_kw', [], $$uri, $uid, $kw); } - $self->wq_close(1); } -sub lei_import { # the main "lei import" method - my ($lei, @inputs) = @_; +sub do_import_index ($$@) { + my ($self, $lei, @inputs) = @_; my $sto = $lei->_lei_store(1); $sto->write_prepare($lei); - my $self = bless {}, __PACKAGE__; $self->{-import_kw} = $lei->{opt}->{kw} // 1; + my $vmd_mod = $self->vmd_mod_extract(\@inputs); + return $lei->fail(join("\n", @{$vmd_mod->{err}})) if $vmd_mod->{err}; + $self->{all_vmd} = $vmd_mod if scalar keys %$vmd_mod; + $lei->ale; # initialize for workers to read (before LeiPmdir->new) + $self->{-mail_sync} = $lei->{opt}->{'mail-sync'} // 1; $self->prepare_inputs($lei, \@inputs) or return; - $lei->ale; # initialize for workers to read - my $j = $lei->{opt}->{jobs} // scalar(@{$self->{inputs}}) || 1; - if (my $net = $lei->{net}) { + + my $j = $lei->{opt}->{jobs} // 0; + $j =~ /\A([0-9]+),[0-9]+\z/ and $j = $1 + 0; + $j ||= scalar(@{$self->{inputs}}) || 1; + my $ikw; + my $net = $lei->{net}; + if ($net) { # $j = $net->net_concurrency($j); TODO + if ($lei->{opt}->{incremental} // 1) { + $net->{incremental} = 1; + $net->{-lms_rw} = $lei->lms // 0; + if ($self->{-import_kw} && $net->{-lms_rw} && + !$lei->{opt}->{'new-only'} && + $net->{imap_order}) { + require PublicInbox::LeiImportKw; + $ikw = PublicInbox::LeiImportKw->new($lei); + $net->{each_old} = 1; + } + } } else { my $nproc = $self->detect_nproc; $j = $nproc if $j > $nproc; } - my $ops = { '' => [ \&import_done, $lei ] }; - $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; - $self->{-wq_nr_workers} = $j // 1; # locked - my $op = $lei->workers_start($self, 'lei_import', undef, $ops); - $lei->{imp} = $self; - $self->wq_io_do('input_stdin', []) if $self->{0}; - net_merge_complete($self) unless $lei->{auth}; - while ($op && $op->{sock}) { $op->event_step } + ($lei->{opt}->{'new-only'} && (!$net || !$net->{imap_order})) and + warn "# --new-only is only for IMAP\n"; + $lei->{-eml_noisy} = 1; + $lei->{-err_type} = 'non-fatal'; + $lei->wq1_start($self, $j); +} + +sub lei_import { # the main "lei import" method + my ($lei, @inputs) = @_; + my $self = bless {}, __PACKAGE__; + do_import_index($self, $lei, @inputs); +} + +sub _complete_import { + my ($lei, @argv) = @_; + my ($re, $cur, $match_cb) = $lei->complete_url_prepare(\@argv); + my @k = $lei->url_folder_cache->keys($argv[-1] // undef, 1); + my @m = map { $match_cb->($_) } @k; + my %f = map { $_ => 1 } (@m ? @m : @k); + if (my $lms = $lei->lms) { + @k = $lms->folders($argv[-1] // undef, 1); + @m = map { $match_cb->($_) } @k; + if (@m) { @f{@m} = @m } else { @f{@k} = @k } + } + keys %f; } 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;