imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 6a90e7e1e756fa02bfe68c0496edcfe336f3257d..a1dcc907252f47d7716a83e799e2912a34be2416 100644 (file)
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -8,6 +8,7 @@ use v5.10.1;
 use PublicInbox::DS;
 use PublicInbox::Spawn qw(which popen_rd);
 use PublicInbox::InboxWritable qw(eml_from_path);
+use PublicInbox::AutoReap;
 
 # JMAP RFC 8621 4.1.1
 # https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml
@@ -29,7 +30,7 @@ my %ERR = (
                my ($label) = @_;
                length($label) >= $L_MAX and
                        return "`$label' too long (must be <= $L_MAX)";
-               $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z}i ?
+               $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z} ?
                        undef : "`$label' is invalid";
        },
        kw => sub {
@@ -63,6 +64,16 @@ sub input_mbox_cb { # base MboxReader callback
        $self->input_eml_cb($eml);
 }
 
+sub input_maildir_cb {
+       my ($fn, $kw, $eml, $self) = @_;
+       $self->input_eml_cb($eml);
+}
+
+sub input_net_cb { # imap_each, nntp_each cb
+       my ($url, $uid, $kw, $eml, $self) = @_;
+       $self->input_eml_cb($eml);
+}
+
 # import a single file handle of $name
 # Subclass must define ->input_eml_cb and ->input_mbox_cb
 sub input_fh {
@@ -102,15 +113,15 @@ sub handle_http_input ($$@) {
        push @$curl, '-s', @$curl_opt;
        my $cmd = $curl->for_uri($lei, $uri);
        $lei->qerr("# $cmd");
-       my $rdr = { 2 => $lei->{2}, pgid => 0 };
-       my ($fh, $pid) = popen_rd($cmd, undef, $rdr);
+       my ($fh, $pid) = popen_rd($cmd, undef, { 2 => $lei->{2} });
+       my $ar = PublicInbox::AutoReap->new($pid);
        grep(/\A--compressed\z/, @$curl) or
                $fh = IO::Uncompress::Gunzip->new($fh, MultiStream => 1);
        eval { $self->input_fh('mboxrd', $fh, $url, @args) };
-       my $err = $@;
-       waitpid($pid, 0);
-       $? || $err and
-               $lei->child_error($?, "@$cmd failed".$err ? " $err" : '');
+       my @err = ($@ ? $@ : ());
+       $ar->join;
+       push(@err, "\$?=$?") if $?;
+       $lei->child_error($?, "@$cmd failed: @err") if @err;
 }
 
 sub input_path_url {
@@ -183,7 +194,17 @@ EOM
                                                $self, @args);
                }
        } elsif ($self->{missing_ok} && !-e $input) { # don't ->fail
-               $self->folder_missing("$ifmt:$input");
+               if ($lei->{cmd} eq 'p2q') {
+                       my $fp = [ qw(git format-patch --stdout -1), $input ];
+                       my $rdr = { 2 => $lei->{2} };
+                       my $fh = popen_rd($fp, undef, $rdr);
+                       eval { $self->input_fh('eml', $fh, $input, @args) };
+                       my @err = ($@ ? $@ : ());
+                       close($fh) or push @err, "\$?=$?";
+                       $lei->child_error($?, "@$fp failed: @err") if @err;
+               } else {
+                       $self->folder_missing("$ifmt:$input");
+               }
        } else {
                $lei->fail("$ifmt_pfx$input unsupported (TODO)");
        }
@@ -329,9 +350,12 @@ $input is `eml', not --in-format=$in_fmt
                                }
                                push @md, $input;
                        } elsif ($self->{missing_ok} && !-e $input) {
-                               # for lei rm-watch
-                               $may_sync and $input = 'maildir:'.
+                               if ($lei->{cmd} eq 'p2q') {
+                                       # will run "git format-patch"
+                               } elsif ($may_sync) { # for lei rm-watch
+                                       $input = 'maildir:'.
                                                $lei->abs_path($input);
+                               }
                        } else {
                                return $lei->fail("Unable to handle $input")
                        }
@@ -401,7 +425,7 @@ sub input_only_atfork_child {
 sub input_only_net_merge_all_done {
        my ($self) = @_;
        $self->wq_io_do('process_inputs');
-       $self->wq_close(1);
+       $self->wq_close;
 }
 
 # like Getopt::Long, but for +kw:FOO and -kw:FOO to prepare