use strict;
use v5.10.1;
use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-use PublicInbox::Eml;
-use PublicInbox::LeiStore;
use PublicInbox::LeiOverview;
-sub mbox_cb { # MboxReader callback used by PublicInbox::LeiInput::input_fh
+# /^input_/ subs are used by PublicInbox::LeiInput
+
+sub input_mbox_cb { # MboxReader callback
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
+sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
my ($self, $eml) = @_;
- $self->{wcb}->(undef, { kw => [] }, $eml);
+ $self->{wcb}->(undef, {}, $eml);
}
-sub net_cb { # callback for ->imap_each, ->nntp_each
+sub input_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);
}
-sub mdir_cb {
- my ($f, $kw, $eml, $self) = @_;
+sub input_maildir_cb {
+ my (undef, $kw, $eml, $self) = @_; # $_[0] $filename ignored
$self->{wcb}->(undef, { kw => $kw }, $eml);
}
sub do_convert { # via wq_do
my ($self) = @_;
- my $lei = $self->{lei};
- my $ifmt = $lei->{opt}->{'in-format'};
- if (my $stdin = delete $self->{0}) {
- $self->input_fh($ifmt, $stdin, '<stdin>');
- }
+ $self->input_stdin;
for my $input (@{$self->{inputs}}) {
- my $ifmt = lc($ifmt // '');
- if ($input =~ m!\Aimaps?://!) {
- $lei->{net}->imap_each($input, \&net_cb, $self);
- next;
- } elsif ($input =~ m!\A(?:nntps?|s?news)://!) {
- $lei->{net}->nntp_each($input, \&net_cb, $self);
- next;
- } elsif ($input =~ s!\A([a-z0-9]+):!!i) {
- $ifmt = lc $1;
- }
- if (-f $input) {
- 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 _) {
- PublicInbox::MdirReader::maildir_each_eml($input,
- \&mdir_cb, $self);
- } else {
- die "BUG: $input unhandled"; # should've failed earlier
- }
+ $self->input_path_url($input);
}
- delete $lei->{1};
+ delete $self->{lei}->{1};
delete $self->{wcb}; # commit
}
use strict;
use v5.10.1;
use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-use PublicInbox::Eml;
-use PublicInbox::PktOp qw(pkt_do);
-sub eml_cb { # used by PublicInbox::LeiInput::input_fh
+# /^input_/ subs are used by (or override) PublicInbox::LeiInput superclass
+
+sub input_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
+sub input_mbox_cb { # MboxReader callback
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);
+ input_eml_cb($self, $eml, $vmd);
+}
+
+sub input_maildir_cb { # maildir_each_eml cb
+ my ($f, $kw, $eml, $self) = @_;
+ input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
+}
+
+sub input_net_cb { # imap_each, nntp_each cb
+ my ($url, $uid, $kw, $eml, $self) = @_;
+ input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
}
sub import_done_wait { # dwaitpid callback
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_io_do('input_path_url', [], $input);
}
$self->wq_close(1);
}
$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};
+ $lei->{imp} = $self;
+ $self->wq_io_do('input_stdin', []) if $self->{0};
net_merge_complete($self) unless $lei->{auth};
while ($op && $op->{sock}) { $op->event_step }
}
import_start($lei);
}
-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 => $kw } : ());
-}
-
-sub import_path_url {
- my ($self, $input) = @_;
- my $lei = $self->{lei};
- my $ifmt = lc($lei->{opt}->{'in-format'} // '');
- # TODO auto-detect?
- 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) {
- 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_eml($input,
- \&_import_maildir,
- $lei->{sto}, $self->{-import_kw});
- } else {
- $lei->fail("$input unsupported (TODO)");
- }
-}
-
-sub import_stdin {
- my ($self) = @_;
- my $lei = $self->{lei};
- 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;
}
# import a single file handle of $name
-# Subclass must define ->eml_cb and ->mbox_cb
+# Subclass must define ->input_eml_cb and ->input_mbox_cb
sub input_fh {
my ($self, $ifmt, $fh, $name, @args) = @_;
if ($ifmt eq 'eml') {
+ require PublicInbox::Eml;
my $buf = do { local $/; <$fh> } //
return $self->{lei}->child_error(1 << 8, <<"");
error reading $name: $!
# but no Content-Length or "From " escaping.
# "git format-patch" also generates such files by default.
$buf =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
- $self->eml_cb(PublicInbox::Eml->new(\$buf), @args);
+ $self->input_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);
+ $cb->(undef, $fh, $self->can('input_mbox_cb'), $self, @args);
+ }
+}
+
+sub input_stdin {
+ my ($self) = @_;
+ my $in = delete $self->{0} or return;
+ $self->input_fh($self->{lei}->{opt}->{'in-format'}, $in, '<stdin>');
+}
+
+sub input_path_url {
+ my ($self, $input, @args) = @_;
+ my $lei = $self->{lei};
+ my $ifmt = lc($lei->{opt}->{'in-format'} // '');
+ # TODO auto-detect?
+ if ($input =~ m!\Aimaps?://!i) {
+ $lei->{net}->imap_each($input, $self->can('input_net_cb'),
+ $self, @args);
+ return;
+ } elsif ($input =~ m!\A(?:nntps?|s?news)://!i) {
+ $lei->{net}->nntp_each($input, $self->can('input_net_cb'),
+ $self, @args);
+ return;
+ }
+ $input =~ s!\A([a-z0-9]+):!!i and $ifmt = lc($1);
+ if (-f $input) {
+ 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, @args);
+ } 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,
+ $self->can('input_maildir_cb'),
+ $self, @args);
+ } else {
+ $lei->fail("$input unsupported (TODO)");
}
}
use strict;
use v5.10.1;
use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-use PublicInbox::Eml;
-use PublicInbox::PktOp qw(pkt_do);
# JMAP RFC 8621 4.1.1
my @KW = (qw(seen answered flagged draft), # system
`$kw' is not one of: `seen', `flagged', `answered', `draft'
`junk', `notjunk', `phishing' or `forwarded'
EOM
-
}
);
$vmd_mod;
}
-sub eml_cb { # used by PublicInbox::LeiInput::input_fh
+sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
my ($self, $eml) = @_;
if (my $xoids = $self->{lei}->{ale}->xoids_for($eml)) {
$self->{lei}->{sto}->ipc_do('update_xvmd', $xoids,
}
}
-sub mbox_cb { eml_cb($_[1], $_[0]) } # used by PublicInbox::LeiInput::input_fh
+sub input_mbox_cb { input_eml_cb($_[1], $_[0]) }
sub mark_done_wait { # dwaitpid callback
my ($arg, $pid) = @_;
sub net_merge_complete { # callback used by LeiAuth
my ($self) = @_;
for my $input (@{$self->{inputs}}) {
- $self->wq_io_do('mark_path_url', [], $input);
+ $self->wq_io_do('input_path_url', [], $input);
}
$self->wq_close(1);
}
-sub _mark_maildir { # maildir_each_eml cb
+sub input_maildir_cb { # maildir_each_eml cb
my ($f, $kw, $eml, $self) = @_;
- eml_cb($self, $eml);
+ input_eml_cb($self, $eml);
}
-sub _mark_net { # imap_each, nntp_each cb
+sub input_net_cb { # imap_each, nntp_each cb
my ($url, $uid, $kw, $eml, $self) = @_;
- eml_cb($self, $eml)
+ input_eml_cb($self, $eml);
}
sub lei_mark { # the "lei mark" method
$lei->{auth}->op_merge($ops, $self) if $lei->{auth};
$self->{vmd_mod} = $vmd_mod;
my $op = $lei->workers_start($self, 'lei_mark', 1, $ops);
- $self->wq_io_do('mark_stdin', []) if $self->{0};
+ $lei->{mark} = $self;
+ $self->wq_io_do('input_stdin', []) if $self->{0};
net_merge_complete($self) unless $lei->{auth};
while ($op && $op->{sock}) { $op->event_step }
}
-sub mark_path_url {
- my ($self, $input) = @_;
- my $lei = $self->{lei};
- my $ifmt = lc($lei->{opt}->{'in-format'} // '');
- # TODO auto-detect?
- if ($input =~ m!\Aimaps?://!i) {
- $lei->{net}->imap_each($input, \&_mark_net, $self);
- return;
- } elsif ($input =~ m!\A(?:nntps?|s?news)://!i) {
- $lei->{net}->nntp_each($input, \&_mark_net, $self);
- return;
- } elsif ($input =~ s!\A([a-z0-9]+):!!i) {
- $ifmt = lc $1;
- }
- if (-f $input) {
- 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_eml($input,
- \&_mark_maildir, $self);
- } else {
- $lei->fail("$input unsupported (TODO)");
- }
-}
-
-sub mark_stdin {
- my ($self) = @_;
- my $lei = $self->{lei};
- my $in = delete $self->{0};
- $self->input_fh($lei->{opt}->{'in-format'}, $in, '<stdin>');
-}
-
sub note_missing {
my ($self) = @_;
$self->{lei}->child_error(1 << 8) if $self->{missing};