package PublicInbox::LeiImport;
use strict;
use v5.10.1;
-use parent qw(PublicInbox::IPC);
+use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
use PublicInbox::Eml;
-use PublicInbox::InboxWritable qw(eml_from_path);
use PublicInbox::PktOp qw(pkt_do);
-sub _import_eml { # MboxReader callback
- my ($eml, $sto, $set_kw) = @_;
- $sto->ipc_do('set_eml', $eml, $set_kw ? $sto->mbox_keywords($eml) : ());
+sub 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);
+}
+
+sub mbox_cb { # MboxReader callback used by PublicInbox::LeiInput::input_fh
+ my ($eml, $self) = @_;
+ my $vmd;
+ if ($self->{-import_kw}) {
+ my $kw = PublicInbox::MboxReader::mbox_keywords($eml);
+ $vmd = { kw => $kw } if scalar(@$kw);
+ }
+ 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 $ign = $lei->{sto}->ipc_do('done'); # PublicInbox::LeiStore::done
+ my $sto = delete $lei->{sto};
+ my $wait = $sto->ipc_do('done') if $sto; # PublicInbox::LeiStore::done
$lei->dclose;
}
$imp->wq_wait_old(\&import_done_wait, $lei);
}
-sub net_merge_all { # via wq_broadcast
- my ($self, $net_new) = @_;
- my $net = $self->{lei}->{net};
- %$net = (%$net, %$net_new);
- pkt_do($self->{lei}->{pkt_op_p}, 'net_merge_done1') or
- die "pkt_op_do net_merge_done1: $!";
-}
-
-sub net_merge_continue { # first worker is done with auth
- my ($self, $net_new) = @_;
- $self->wq_broadcast('net_merge_all', $net_new);
-}
-
-sub net_merge_complete {
+sub net_merge_complete { # callback used by LeiAuth
my ($self) = @_;
for my $input (@{$self->{inputs}}) {
$self->wq_io_do('import_path_url', [], $input);
$self->wq_close(1);
}
-sub net_merge_done1 {
- my ($self) = @_;
- my $lei = $self->{lei};
- return if ++$lei->{nr_net_merge_done} != $self->{-wq_nr_workers};
- net_merge_complete($self);
-}
-
sub import_start {
my ($lei) = @_;
my $self = $lei->{imp};
+ $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
$j = $nproc if $j > $nproc;
}
my $ops = { '' => [ \&import_done, $lei ] };
- my $auth = $lei->{auth};
- if ($auth) {
- $ops->{net_merge} = [ \&net_merge_continue, $self ];
- $ops->{net_merge_done1} = [ \&net_merge_done1, $self ];
- }
+ $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);
$self->wq_io_do('import_stdin', []) if $self->{0};
- net_merge_complete($self) if !$auth;
+ net_merge_complete($self) unless $lei->{auth};
while ($op && $op->{sock}) { $op->event_step }
}
-sub call { # the main "lei import" method
- my ($cls, $lei, @inputs) = @_;
+sub lei_import { # the main "lei import" method
+ my ($lei, @inputs) = @_;
my $sto = $lei->_lei_store(1);
$sto->write_prepare($lei);
- my ($net, @f, @d);
- $lei->{opt}->{kw} //= 1;
- my $self = $lei->{imp} = bless { inputs => \@inputs }, $cls;
- if ($lei->{opt}->{stdin}) {
- @inputs and return $lei->fail("--stdin and @inputs do not mix");
- $lei->check_input_format or return;
- $self->{0} = $lei->{0};
- }
-
- # TODO: do we need --format for non-stdin?
- my $fmt = $lei->{opt}->{'format'};
- # e.g. Maildir:/home/user/Mail/ or imaps://example.com/INBOX
- for my $input (@inputs) {
- my $input_path = $input;
- if ($input =~ m!\A(?:imap|nntp)s?://!i) {
- require PublicInbox::NetReader;
- $net //= PublicInbox::NetReader->new;
- $net->add_url($input);
- } elsif ($input_path =~ s/\A([a-z0-9]+)://is) {
- my $ifmt = lc $1;
- if (($fmt // $ifmt) ne $ifmt) {
- return $lei->fail(<<"");
---format=$fmt and `$ifmt:' conflict
-
- }
- if (-f $input_path) {
- require PublicInbox::MboxReader;
- PublicInbox::MboxReader->can($ifmt) or return
- $lei->fail("$ifmt not supported");
- } elsif (-d _) {
- require PublicInbox::MdirReader;
- $ifmt eq 'maildir' or return
- $lei->fail("$ifmt not supported");
- } else {
- return $lei->fail("Unable to handle $input");
- }
- } elsif (-f $input) { push @f, $input
- } elsif (-d _) { push @d, $input
- } else { return $lei->fail("Unable to handle $input") }
- }
- if (@f) { $lei->check_input_format(\@f) or return }
- if (@d) { # TODO: check for MH vs Maildir, here
- require PublicInbox::MdirReader;
- }
- $self->{inputs} = \@inputs;
- if ($net) {
- if (my $err = $net->errors) {
- return $lei->fail($err);
- }
- $net->{quiet} = $lei->{opt}->{quiet};
- $lei->{net} = $net;
- require PublicInbox::LeiAuth;
- $lei->{auth} = PublicInbox::LeiAuth->new($net);
- }
+ my $self = $lei->{imp} = bless {}, __PACKAGE__;
+ $self->{-import_kw} = $lei->{opt}->{kw} // 1;
+ $self->prepare_inputs($lei, \@inputs) or return;
import_start($lei);
}
-sub ipc_atfork_child {
- my ($self) = @_;
- my $lei = $self->{lei};
- delete $lei->{imp}; # drop circular ref
- $lei->lei_atfork_child;
- $self->SUPER::ipc_atfork_child;
- my $net = $lei->{net};
- if ($net && $self->{-wq_worker_nr} == 0) {
- my $mics = $net->imap_common_init($lei);
- PublicInbox::LeiAuth::net_merge($lei, $net);
- $net->{mics_cached} = $mics;
- }
- undef;
-}
-
-sub _import_fh {
- my ($lei, $fh, $input, $ifmt) = @_;
- my $set_kw = $lei->{opt}->{kw};
- eval {
- if ($ifmt eq 'eml') {
- my $buf = do { local $/; <$fh> } //
- return $lei->child_error(1 << 8, <<"");
-error reading $input: $!
-
- my $eml = PublicInbox::Eml->new(\$buf);
- _import_eml($eml, $lei->{sto}, $set_kw);
- } else { # some mbox (->can already checked in call);
- my $cb = PublicInbox::MboxReader->can($ifmt) //
- die "BUG: bad fmt=$ifmt";
- $cb->(undef, $fh, \&_import_eml, $lei->{sto}, $set_kw);
- }
- };
- $lei->child_error(1 << 8, "<stdin>: $@") if $@;
-}
-
-sub _import_maildir { # maildir_each_file cb
- my ($f, $sto, $set_kw) = @_;
- $sto->ipc_do('set_eml_from_maildir', $f, $set_kw);
+sub _import_maildir { # maildir_each_eml cb
+ my ($f, $kw, $eml, $sto, $set_kw) = @_;
+ $sto->ipc_do('set_eml', $eml, $set_kw ? { kw => $kw }: ());
}
-sub _import_imap { # imap_each cb
+sub _import_net { # imap_each, nntp_each cb
my ($url, $uid, $kw, $eml, $sto, $set_kw) = @_;
- warn "$url $uid";
- $sto->ipc_do('set_eml', $eml, $set_kw ? @$kw : ());
+ $sto->ipc_do('set_eml', $eml, $set_kw ? { kw => $kw } : ());
}
sub import_path_url {
my ($self, $input) = @_;
my $lei = $self->{lei};
- my $ifmt = lc($lei->{opt}->{'format'} // '');
+ my $ifmt = lc($lei->{opt}->{'in-format'} // '');
# TODO auto-detect?
- if ($input =~ m!\A(imap|nntp)s?://!i) {
- $lei->{net}->imap_each($input, \&_import_imap, $lei->{sto},
- $lei->{opt}->{kw});
+ if ($input =~ m!\Aimaps?://!i) {
+ $lei->{net}->imap_each($input, \&_import_net, $lei->{sto},
+ $self->{-import_kw});
+ return;
+ } elsif ($input =~ m!\A(?:nntps?|s?news)://!i) {
+ $lei->{net}->nntp_each($input, \&_import_net, $lei->{sto}, 0);
return;
} elsif ($input =~ s!\A([a-z0-9]+):!!i) {
$ifmt = lc $1;
}
if (-f $input) {
- open my $fh, '<', $input or return $lei->child_error(1 << 8, <<"");
-unable to open $input: $!
-
- _import_fh($lei, $fh, $input, $ifmt);
+ my $m = $lei->{opt}->{'lock'} // ($ifmt eq 'eml' ? ['none'] :
+ PublicInbox::MboxLock->defaults);
+ my $mbl = PublicInbox::MboxLock->acq($input, 0, $m);
+ $self->input_fh($ifmt, $mbl->{fh}, $input);
} elsif (-d _ && (-d "$input/cur" || -d "$input/new")) {
return $lei->fail(<<EOM) if $ifmt && $ifmt ne 'maildir';
$input appears to a be a maildir, not $ifmt
EOM
- PublicInbox::MdirReader::maildir_each_file($input,
+ PublicInbox::MdirReader::maildir_each_eml($input,
\&_import_maildir,
- $lei->{sto}, $lei->{opt}->{kw});
+ $lei->{sto}, $self->{-import_kw});
} else {
$lei->fail("$input unsupported (TODO)");
}
sub import_stdin {
my ($self) = @_;
my $lei = $self->{lei};
- _import_fh($lei, delete $self->{0}, '<stdin>', $lei->{opt}->{'format'});
+ my $in = delete $self->{0};
+ $self->input_fh($lei->{opt}->{'in-format'}, $in, '<stdin>');
}
+no warnings 'once';
+*ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child;
+
+# the following works even when LeiAuth is lazy-loaded
+*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all;
1;