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);
}
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);
+ 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_wait { # dwaitpid callback
- my ($arg, $pid) = @_;
- my ($imp, $lei) = @$arg;
- $lei->child_error($?, 'non-fatal errors during import') if $?;
- my $sto = delete $lei->{sto} // return $lei->fail('BUG: {sto} gone');
- my $wait = $sto->ipc_do('done'); # PublicInbox::LeiStore::done
- $lei->dclose;
+sub input_nntp_cb { # nntp_each
+ my ($url, $num, $kw, $eml, $self) = @_;
+ input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
}
sub import_done { # EOF callback for main daemon
my ($lei) = @_;
my $imp = delete $lei->{imp} // return $lei->fail('BUG: {imp} gone');
- $imp->wq_wait_old(\&import_done_wait, $lei);
+ $imp->wq_wait_old($lei->can('wq_done_wait'), $lei, 'non-fatal');
}
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);
}
$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;