lei: simple WQ workers use {wq1} field

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

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 991c84f20b4b0fc09fdc798086a58ad4c84a7a29..26127ecec4b1fa3ad6f0e8fdc56cd04cd4cf9260 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -12,6 +12,9 @@ use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
 sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
        my ($self, $eml, $vmd) = @_;
        my $xoids = $self->{lei}->{ale}->xoids_for($eml);
+       if (my $all_vmd = $self->{all_vmd}) {
+               @$vmd{keys %$all_vmd} = values %$all_vmd;
+       }
        $self->{lei}->{sto}->ipc_do('set_eml', $eml, $vmd, $xoids);
 }
 
@@ -27,66 +30,69 @@ sub input_mbox_cb { # MboxReader callback
 
 sub input_maildir_cb { # maildir_each_eml cb
        my ($f, $kw, $eml, $self) = @_;
-       input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
+       my $vmd = $self->{-import_kw} ? { kw => $kw } : undef;
+       if ($self->{-mail_sync}) {
+               if ($f =~ m!\A(.+?)/(?:new|cur)/([^/]+)\z!) { # ugh...
+                       $vmd->{sync_info} = [ "maildir:$1", \(my $n = $2) ];
+               } else {
+                       warn "E: $f was not from a Maildir?\n";
+               }
+       }
+       input_eml_cb($self, $eml, $vmd);
 }
 
-sub input_net_cb { # imap_each, nntp_each cb
+sub input_imap_cb { # imap_each
        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;
+       my $vmd = $self->{-import_kw} ? { kw => $kw } : undef;
+       $vmd->{sync_info} = [ $url, $uid ] if $self->{-mail_sync};
+       input_eml_cb($self, $eml, $vmd);
 }
 
-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 input_nntp_cb { # nntp_each
+       my ($url, $num, $kw, $eml, $self) = @_;
+       input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
 }
 
 sub net_merge_complete { # callback used by LeiAuth
        my ($self) = @_;
-       for my $input (@{$self->{inputs}}) {
-               $self->wq_io_do('input_path_url', [], $input);
-       }
+       $self->wq_io_do('process_inputs');
        $self->wq_close(1);
 }
 
-sub import_start {
-       my ($lei) = @_;
-       my $self = $lei->{imp};
+sub lei_import { # the main "lei import" method
+       my ($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;
+       $self->prepare_inputs($lei, \@inputs) or return;
+       $self->{-mail_sync} = $lei->{opt}->{sync} // 1;
+
        $lei->ale; # initialize for workers to read
        my $j = $lei->{opt}->{jobs} // scalar(@{$self->{inputs}}) || 1;
        if (my $net = $lei->{net}) {
                # $j = $net->net_concurrency($j); TODO
+               if ($lei->{opt}->{incremental} // 1) {
+                       $net->{incremental} = 1;
+                       $net->{itrk_fn} = $lei->store_path .
+                                               '/net_last.sqlite3';
+               }
        } else {
                my $nproc = $self->detect_nproc;
                $j = $nproc if $j > $nproc;
        }
-       my $ops = { '' => [ \&import_done, $lei ] };
+       my $ops = {};
        $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};
+       $lei->{-eml_noisy} = 1;
+       (my $op_c, $ops) = $lei->workers_start($self, 'lei-import', $j, $ops);
+       $lei->{wq1} = $self;
+       $lei->{-err_type} = 'non-fatal';
        net_merge_complete($self) unless $lei->{auth};
-       while ($op && $op->{sock}) { $op->event_step }
-}
-
-sub lei_import { # the main "lei import" method
-       my ($lei, @inputs) = @_;
-       my $sto = $lei->_lei_store(1);
-       $sto->write_prepare($lei);
-       my $self = $lei->{imp} = bless {}, __PACKAGE__;
-       $self->{-import_kw} = $lei->{opt}->{kw} // 1;
-       $self->prepare_inputs($lei, \@inputs) or return;
-       import_start($lei);
+       $op_c->op_wait_event($ops);
 }
 
 no warnings 'once';