www_stream: add trailing slash for help and color links

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

diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index a7e4787125506134744440c8fc4e465d66abd504..fcc67f0bfe25ea3d2b72fee28e593cb1a3da3a6d 100644 (file)
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -7,15 +7,14 @@ use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC);
 use PublicInbox::Eml;
-use PublicInbox::InboxWritable qw(eml_from_path);
 use PublicInbox::LeiStore;
 use PublicInbox::LeiOverview;
 
 sub mbox_cb {
        my ($eml, $self) = @_;
-       my @kw = PublicInbox::LeiStore::mbox_keywords($eml);
+       my $kw = PublicInbox::MboxReader::mbox_keywords($eml);
        $eml->header_set($_) for qw(Status X-Status);
-       $self->{wcb}->(undef, { kw => \@kw }, $eml);
+       $self->{wcb}->(undef, { kw => $kw }, $eml);
 }
 
 sub net_cb { # callback for ->imap_each, ->nntp_each
@@ -24,37 +23,49 @@ sub net_cb { # callback for ->imap_each, ->nntp_each
 }
 
 sub mdir_cb {
-       my ($kw, $eml, $self) = @_;
+       my ($f, $kw, $eml, $self) = @_;
        $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;
                }
                if (-f $input) {
-                       open my $fh, '<', $input or
-                                       return $lei->fail("open $input: $!");
-                       PublicInbox::MboxReader->$ifmt($fh, \&mbox_cb, $self);
+                       my $m = $lei->{opt}->{'lock'} //
+                                       ($ifmt eq 'eml' ? ['none'] :
+                                       PublicInbox::MboxLock->defaults);
+                       my $mbl = PublicInbox::MboxLock->acq($input, 0, $m);
+                       convert_fh($self, $ifmt, $mbl->{fh}, $input);
                } elsif (-d _) {
                        PublicInbox::MdirReader::maildir_each_eml($input,
                                                        \&mdir_cb, $self);
@@ -72,15 +83,16 @@ 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");
-               $lei->check_input_format(undef, 'in-format') or return;
+               $lei->check_input_format(undef) or return;
                $self->{0} = $lei->{0};
        }
        # e.g. Maildir:/home/user/Mail/ or imaps://example.com/INBOX
@@ -88,8 +100,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) {
@@ -98,6 +110,7 @@ sub call { # the main "lei convert" method
 
                        }
                        if (-f $input_path) {
+                               require PublicInbox::MboxLock;
                                require PublicInbox::MboxReader;
                                PublicInbox::MboxReader->can($ifmt) or return
                                        $lei->fail("$ifmt not supported");
@@ -112,17 +125,17 @@ sub call { # the main "lei convert" method
                elsif (-d _) { push @d, $input }
                else { return $lei->fail("Unable to handle $input") }
        }
-       if (@f) { $lei->check_input_format(\@f, 'in-format') or return }
+       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 ($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 +150,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;
 }