X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiImport.pm;h=e769fba828c9a85241a6956d6fffe3856dfd0b78;hb=a00fdf39b4ec4ed045f28c29c79c8dcb9abac836;hp=7f247b640937bf4387ac353112ade62bff197976;hpb=cf7c27cadd9ce7800beedc72513cf12fda77420f;p=public-inbox.git diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 7f247b64..e769fba8 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -5,20 +5,27 @@ 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::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) : ()); + my ($eml, $lei, $mbox_keywords) = @_; + my $vmd; + if ($mbox_keywords) { + my $kw = $mbox_keywords->($eml); + $vmd = { kw => $kw } if scalar(@$kw); + } + my $xoids = $lei->{ale}->xoids_for($eml); + $lei->{sto}->ipc_do('set_eml', $eml, $vmd, $xoids); } 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; } @@ -39,6 +46,7 @@ sub net_merge_complete { # callback used by LeiAuth sub import_start { my ($lei) = @_; my $self = $lei->{imp}; + $lei->ale; my $j = $lei->{opt}->{jobs} // scalar(@{$self->{inputs}}) || 1; if (my $net = $lei->{net}) { # $j = $net->net_concurrency($j); TODO @@ -55,63 +63,13 @@ sub import_start { 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}; - } - - my $fmt = $lei->{opt}->{'in-format'}; - # e.g. Maildir:/home/user/Mail/ or imaps://example.com/INBOX - for my $input (@inputs) { - my $input_path = $input; - if ($input =~ m!\A(?:imaps?|nntps?|s?news)://!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; - } + my $self = $lei->{imp} = bless {}, __PACKAGE__; + $self->prepare_inputs($lei, \@inputs) or return; import_start($lei); } @@ -127,7 +85,8 @@ sub ipc_atfork_child { sub _import_fh { my ($lei, $fh, $input, $ifmt) = @_; - my $set_kw = $lei->{opt}->{kw}; + my $kw = $lei->{opt}->{kw} ? + PublicInbox::MboxReader->can('mbox_keywords') : undef; eval { if ($ifmt eq 'eml') { my $buf = do { local $/; <$fh> } // @@ -135,24 +94,24 @@ sub _import_fh { error reading $input: $! my $eml = PublicInbox::Eml->new(\$buf); - _import_eml($eml, $lei->{sto}, $set_kw); + _import_eml($eml, $lei, $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); + $cb->(undef, $fh, \&_import_eml, $lei, $kw); } }; - $lei->child_error(1 << 8, ": $@") if $@; + $lei->child_error(1 << 8, "$input: $@") 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_net { # imap_each, nntp_each cb my ($url, $uid, $kw, $eml, $sto, $set_kw) = @_; - $sto->ipc_do('set_eml', $eml, $set_kw ? @$kw : ()); + $sto->ipc_do('set_eml', $eml, $set_kw ? { kw => $kw } : ()); } sub import_path_url { @@ -171,15 +130,15 @@ sub import_path_url { $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); + _import_fh($lei, $mbl->{fh}, $input, $ifmt); } elsif (-d _ && (-d "$input/cur" || -d "$input/new")) { return $lei->fail(<{sto}, $lei->{opt}->{kw}); } else { @@ -190,7 +149,8 @@ EOM sub import_stdin { my ($self) = @_; my $lei = $self->{lei}; - _import_fh($lei, delete $self->{0}, '', $lei->{opt}->{'in-format'}); + my $in = delete $self->{0}; + _import_fh($lei, $in, '', $lei->{opt}->{'in-format'}); } no warnings 'once'; # the following works even when LeiAuth is lazy-loaded