use PublicInbox::LeiStore;
use PublicInbox::LeiOverview;
-sub mbox_cb {
+sub mbox_cb { # MboxReader callback used by PublicInbox::LeiInput::input_fh
my ($eml, $self) = @_;
my $kw = PublicInbox::MboxReader::mbox_keywords($eml);
$eml->header_set($_) for qw(Status X-Status);
$self->{wcb}->(undef, { kw => $kw }, $eml);
}
+sub eml_cb { # used by PublicInbox::LeiInput::input_fh
+ my ($self, $eml) = @_;
+ $self->{wcb}->(undef, { kw => [] }, $eml);
+}
+
sub net_cb { # callback for ->imap_each, ->nntp_each
my (undef, undef, $kw, $eml, $self) = @_; # @_[0,1]: url + uid ignored
$self->{wcb}->(undef, { kw => $kw }, $eml);
$self->{wcb}->(undef, { kw => $kw }, $eml);
}
-sub convert_fh ($$$$) {
- my ($self, $ifmt, $fh, $name) = @_;
- if ($ifmt eq 'eml') {
- my $buf = do { local $/; <$fh> } //
- return $self->{lei}->child_error(1 << 8, <<"");
-error reading $name: $!
-
- my $eml = PublicInbox::Eml->new(\$buf);
- $self->{wcb}->(undef, { kw => [] }, $eml);
- } else {
- PublicInbox::MboxReader->$ifmt($fh, \&mbox_cb, $self);
- }
-}
-
sub do_convert { # via wq_do
my ($self) = @_;
my $lei = $self->{lei};
- my $in_fmt = $lei->{opt}->{'in-format'};
- my $mics;
+ my $ifmt = $lei->{opt}->{'in-format'};
if (my $stdin = delete $self->{0}) {
- convert_fh($self, $in_fmt, $stdin, '<stdin>');
+ $self->input_fh($ifmt, $stdin, '<stdin>');
}
for my $input (@{$self->{inputs}}) {
- my $ifmt = lc($in_fmt // '');
+ my $ifmt = lc($ifmt // '');
if ($input =~ m!\Aimaps?://!) {
$lei->{net}->imap_each($input, \&net_cb, $self);
next;
($ifmt eq 'eml' ? ['none'] :
PublicInbox::MboxLock->defaults);
my $mbl = PublicInbox::MboxLock->acq($input, 0, $m);
- convert_fh($self, $ifmt, $mbl->{fh}, $input);
+ $self->input_fh($ifmt, $mbl->{fh}, $input);
} elsif (-d _) {
PublicInbox::MdirReader::maildir_each_eml($input,
\&mdir_cb, $self);
use PublicInbox::Eml;
use PublicInbox::PktOp qw(pkt_do);
-sub _import_eml { # MboxReader callback
- my ($eml, $lei, $mbox_keywords) = @_;
+sub eml_cb { # used by PublicInbox::LeiInput::input_fh
+ my ($self, $eml) = @_;
my $vmd;
- if ($mbox_keywords) {
- my $kw = $mbox_keywords->($eml);
+ if ($self->{-import_kw}) { # FIXME
+ my $kw = PublicInbox::MboxReader::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);
+ 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) = @_;
+ eml_cb($self, $eml);
}
sub import_done_wait { # dwaitpid callback
sub import_start {
my ($lei) = @_;
my $self = $lei->{imp};
- $lei->ale;
+ $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
my ($lei, @inputs) = @_;
my $sto = $lei->_lei_store(1);
$sto->write_prepare($lei);
- $lei->{opt}->{kw} //= 1;
my $self = $lei->{imp} = bless {}, __PACKAGE__;
+ $self->{-import_kw} = $lei->{opt}->{kw} // 1;
$self->prepare_inputs($lei, \@inputs) or return;
import_start($lei);
}
undef;
}
-sub _import_fh {
- my ($lei, $fh, $input, $ifmt) = @_;
- my $kw = $lei->{opt}->{kw} ?
- PublicInbox::MboxReader->can('mbox_keywords') : undef;
- 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, $kw);
- } else { # some mbox (->can already checked in call);
- my $cb = PublicInbox::MboxReader->reads($ifmt) //
- die "BUG: bad fmt=$ifmt";
- $cb->(undef, $fh, \&_import_eml, $lei, $kw);
- }
- };
- $lei->child_error(1 << 8, "$input: $@") if $@;
-}
-
sub _import_maildir { # maildir_each_eml cb
my ($f, $kw, $eml, $sto, $set_kw) = @_;
$sto->ipc_do('set_eml', $eml, $set_kw ? { kw => $kw }: ());
# TODO auto-detect?
if ($input =~ m!\Aimaps?://!i) {
$lei->{net}->imap_each($input, \&_import_net, $lei->{sto},
- $lei->{opt}->{kw});
+ $self->{-import_kw});
return;
} elsif ($input =~ m!\A(?:nntps?|s?news)://!i) {
$lei->{net}->nntp_each($input, \&_import_net, $lei->{sto}, 0);
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);
+ $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_eml($input,
\&_import_maildir,
- $lei->{sto}, $lei->{opt}->{kw});
+ $lei->{sto}, $self->{-import_kw});
} else {
$lei->fail("$input unsupported (TODO)");
}
my ($self) = @_;
my $lei = $self->{lei};
my $in = delete $self->{0};
- _import_fh($lei, $in, '<stdin>', $lei->{opt}->{'in-format'});
+ $self->input_fh($lei->{opt}->{'in-format'}, $in, '<stdin>');
}
no warnings 'once'; # the following works even when LeiAuth is lazy-loaded
1;
}
+# import a single file handle of $name
+# Subclass must define ->eml_cb and ->mbox_cb
+sub input_fh {
+ my ($self, $ifmt, $fh, $name, @args) = @_;
+ if ($ifmt eq 'eml') {
+ my $buf = do { local $/; <$fh> } //
+ return $self->{lei}->child_error(1 << 8, <<"");
+error reading $name: $!
+
+ $self->eml_cb(PublicInbox::Eml->new(\$buf), @args);
+ } else {
+ # prepare_inputs already validated $ifmt
+ my $cb = PublicInbox::MboxReader->reads($ifmt) //
+ die "BUG: bad fmt=$ifmt";
+ $cb->(undef, $fh, $self->can('mbox_cb'), $self, @args);
+ }
+}
sub prepare_inputs {
my ($self, $lei, $inputs) = @_;