1 files changed, 31 insertions, 16 deletions

diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index a7e47871..32aa2edb 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -28,25 +28,35 @@ sub mdir_cb {
         $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;
-        if (my $nrd = $lei->{nrd}) { # may prompt user once
-                $nrd->{mics_cached} = $nrd->imap_common_init($lei);
-                $nrd->{nn_cached} = $nrd->nntp_common_init($lei);
-        }
         if (my $stdin = delete $self->{0}) {
-                PublicInbox::MboxReader->$in_fmt($stdin, \&mbox_cb, $self);
+                convert_fh($self, $in_fmt, $stdin, '<stdin>');
         }
         for my $input (@{$self->{inputs}}) {
                 my $ifmt = lc($in_fmt // '');
                 if ($input =~ m!\Aimaps?://!) {
-                        $lei->{nrd}->imap_each($input, \&net_cb, $self);
+                        $lei->{net}->imap_each($input, \&net_cb, $self);
                         next;
                 } elsif ($input =~ m!\A(?:nntps?|s?news)://!) {
-                        $lei->{nrd}->nntp_each($input, \&net_cb, $self);
+                        $lei->{net}->nntp_each($input, \&net_cb, $self);
                         next;
                 } elsif ($input =~ s!\A([a-z0-9]+):!!i) {
                         $ifmt = lc $1;
@@ -54,7 +64,7 @@ sub do_convert { # via wq_do
                 if (-f $input) {
                         open my $fh, '<', $input or
                                         return $lei->fail("open $input: $!");
-                        PublicInbox::MboxReader->$ifmt($fh, \&mbox_cb, $self);
+                        convert_fh($self, $ifmt, $fh, $input);
                 } elsif (-d _) {
                         PublicInbox::MdirReader::maildir_each_eml($input,
                                                         \&mdir_cb, $self);
@@ -72,11 +82,12 @@ sub call { # the main "lei convert" method
         $opt->{kw} //= 1;
         my $self = $lei->{cnv} = bless {}, $cls;
         my $in_fmt = $opt->{'in-format'};
-        my ($nrd, @f, @d);
+        my (@f, @d);
         $opt->{dedupe} //= 'none';
         my $ovv = PublicInbox::LeiOverview->new($lei, 'out-format');
         $lei->{l2m} or return
                 $lei->fail("output not specified or is not a mail destination");
+        my $net = $lei->{net}; # NetWriter may be created by l2m
         $opt->{augment} = 1 unless $ovv->{dst} eq '/dev/stdout';
         if ($opt->{stdin}) {
                 @inputs and return $lei->fail("--stdin and @inputs do not mix");
@@ -88,8 +99,8 @@ sub call { # the main "lei convert" method
                 my $input_path = $input;
                 if ($input =~ m!\A(?:imaps?|nntps?|s?news)://!i) {
                         require PublicInbox::NetReader;
-                        $nrd //= PublicInbox::NetReader->new;
-                        $nrd->add_url($input);
+                        $net //= PublicInbox::NetReader->new;
+                        $net->add_url($input);
                 } elsif ($input_path =~ s/\A([a-z0-9]+)://is) {
                         my $ifmt = lc $1;
                         if (($in_fmt // $ifmt) ne $ifmt) {
@@ -117,12 +128,12 @@ sub call { # the main "lei convert" method
                 require PublicInbox::MdirReader;
         }
         $self->{inputs} = \@inputs;
-        if ($nrd) {
-                if (my $err = $nrd->errors) {
+        if ($net) {
+                if (my $err = $net->errors) {
                         return $lei->fail($err);
                 }
-                $nrd->{quiet} = $opt->{quiet};
-                $lei->{nrd} = $nrd;
+                $net->{quiet} = $opt->{quiet};
+                $lei->{net} //= $net;
         }
         my $op = $lei->workers_start($self, 'lei_convert', 1, {
                 '' => [ $lei->can('dclose'), $lei ]
@@ -137,11 +148,15 @@ sub ipc_atfork_child {
         my $lei = $self->{lei};
         $lei->lei_atfork_child;
         my $l2m = delete $lei->{l2m};
+        if (my $net = $lei->{net}) { # may prompt user once
+                $net->{mics_cached} = $net->imap_common_init($lei);
+                $net->{nn_cached} = $net->nntp_common_init($lei);
+        }
+        $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
         $l2m->pre_augment($lei);
         $l2m->do_augment($lei);
         $l2m->post_augment($lei);
         $self->{wcb} = $l2m->write_cb($lei);
-        $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
         $self->SUPER::ipc_atfork_child;
 }