lei convert: support IMAP output and "-F eml" inputs

[public-inbox.git] / lib / PublicInbox / LeiConvert.pm

diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 3a714502bb71988b4f1c42f13fb65cabd50517d2..32aa2edb0079fbc47f83e8d9c44d4d9313a1446a 100644 (file)
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -18,8 +18,8 @@ sub mbox_cb {
        $self->{wcb}->(undef, { kw => \@kw }, $eml);
 }
 
-sub imap_cb { # ->imap_each
-       my ($url, $uid, $kw, $eml, $self) = @_;
+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);
 }
 
@@ -28,21 +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);
-       }
        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!\A(?:imap|nntp)s?://!) { # TODO: nntp
-                       $lei->{nrd}->imap_each($input, \&imap_cb, $self);
+               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;
@@ -50,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);
@@ -62,28 +76,18 @@ sub do_convert { # via wq_do
        delete $self->{wcb}; # commit
 }
 
-sub convert_start { # LeiAuth->auth_start callback
-       my ($lei) = @_;
-       my $self = $lei->{cnv};
-       my $op = $lei->workers_start($self, 'lei_convert', 1, {
-               '' => [ $lei->can('dclose'), $lei ]
-       });
-       $self->wq_io_do('do_convert', []);
-       $self->wq_close(1);
-       while ($op && $op->{sock}) { $op->event_step }
-}
-
 sub call { # the main "lei convert" method
        my ($cls, $lei, @inputs) = @_;
        my $opt = $lei->{opt};
        $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");
@@ -93,10 +97,10 @@ sub call { # the main "lei convert" method
        # 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) {
+               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) {
@@ -124,14 +128,19 @@ 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;
        }
-       convert_start($lei);
+       my $op = $lei->workers_start($self, 'lei_convert', 1, {
+               '' => [ $lei->can('dclose'), $lei ]
+       });
+       $self->wq_io_do('do_convert', []);
+       $self->wq_close(1);
+       while ($op && $op->{sock}) { $op->event_step }
 }
 
 sub ipc_atfork_child {
@@ -139,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;
 }