lei: start implementing inotify Maildir support

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

diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 8708356491965cbb1214c76d2d2249408b927430..fa330df5fbdb86887faefd686c690a56925de616 100644 (file)
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -7,6 +7,7 @@ use strict;
 use v5.10.1;
 use PublicInbox::DS;
 use PublicInbox::Spawn qw(which popen_rd);
+use PublicInbox::InboxWritable qw(eml_from_path);
 
 # JMAP RFC 8621 4.1.1
 # https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml
@@ -127,6 +128,16 @@ sub input_path_url {
                $ifmt = lc($1);
        } elsif ($input =~ /\.(?:patch|eml)\z/i) {
                $ifmt = 'eml';
+       } elsif (-f $input && $input =~ m{\A(?:.+)/(?:new|cur)/([^/]+)\z}) {
+               my $bn = $1;
+               my $fl = PublicInbox::MdirReader::maildir_basename_flags($bn);
+               return if index($fl, 'T') >= 0;
+               return $self->pmdir_cb($input, $fl) if $self->can('pmdir_cb');
+               my $eml = eml_from_path($input) or return
+                       $lei->qerr("# $input not readable");
+               my $kw = PublicInbox::MdirReader::flags2kw($fl);
+               $self->can('input_maildir_cb')->($input, $kw, $eml, $self);
+               return;
        }
        my $devfd = $lei->path_to_fd($input) // return;
        if ($devfd >= 0) {
@@ -149,11 +160,18 @@ sub input_path_url {
                $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
+$input appears to be a maildir, not $ifmt
 EOM
-               PublicInbox::MdirReader->new->maildir_each_eml($input,
-                                       $self->can('input_maildir_cb'),
-                                       $self, @args);
+               my $mdr = PublicInbox::MdirReader->new;
+               if (my $pmd = $self->{pmd}) {
+                       $mdr->maildir_each_file($input,
+                                               $pmd->can('each_mdir_fn'),
+                                               $pmd, @args);
+               } else {
+                       $mdr->maildir_each_eml($input,
+                                               $self->can('input_maildir_cb'),
+                                               $self, @args);
+               }
        } else {
                $lei->fail("$input unsupported (TODO)");
        }
@@ -215,14 +233,14 @@ sub prepare_inputs { # returns undef on error
                push @{$sync->{no}}, '/dev/stdin' if $sync;
        }
        my $net = $lei->{net}; # NetWriter may be created by l2m
-       my (@f, @d);
+       my (@f, @md);
        # e.g. Maildir:/home/user/Mail/ or imaps://example.com/INBOX
        for my $input (@$inputs) {
                my $input_path = $input;
                if ($input =~ m!\A(?:imaps?|nntps?|s?news)://!i) {
                        require PublicInbox::NetReader;
                        $net //= PublicInbox::NetReader->new;
-                       $net->add_url($input);
+                       $net->add_url($input, $self->{-ls_ok});
                        push @{$sync->{ok}}, $input if $sync;
                } elsif ($input_path =~ m!\Ahttps?://!i) { # mboxrd.gz
                        # TODO: how would we detect r/w JMAP?
@@ -247,10 +265,11 @@ sub prepare_inputs { # returns undef on error
                                PublicInbox::MboxReader->reads($ifmt) or return
                                        $lei->fail("$ifmt not supported");
                        } elsif (-d $input_path) {
-                               require PublicInbox::MdirReader;
                                $ifmt eq 'maildir' or return
                                        $lei->fail("$ifmt not supported");
-                               $input = $lei->abs_path($input) if $sync;
+                               $sync and $input = 'maildir:'.
+                                               $lei->abs_path($input_path);
+                               push @md, $input;
                        } else {
                                return $lei->fail("Unable to handle $input");
                        }
@@ -258,28 +277,40 @@ sub prepare_inputs { # returns undef on error
                        lc($in_fmt//'eml') eq 'eml' or return $lei->fail(<<"");
 $input is `eml', not --in-format=$in_fmt
 
-                       require PublicInbox::Eml;
                        push @{$sync->{no}}, $input if $sync;
+               } elsif (-f $input && $input =~ m{\A(.+)/(new|cur)/([^/]+)\z}) {
+                       # single file in a Maildir
+                       my ($mdir, $nc, $bn) = ($1, $2, $3);
+                       my $other = $mdir . ($nc eq 'new' ? '/cur' : '/new');
+                       return $lei->fail(<<EOM) if !-d $other;
+No `$other' directory for `$input'
+EOM
+                       lc($in_fmt//'eml') eq 'eml' or return $lei->fail(<<"");
+$input is `eml', not --in-format=$in_fmt
+
+                       if ($sync) {
+                               $input = $lei->abs_path($mdir) . "/$nc/$bn";
+                               push @{$sync->{ok}}, $input;
+                       }
+                       require PublicInbox::MdirReader;
                } else {
                        my $devfd = $lei->path_to_fd($input) // return;
                        if ($devfd >= 0 || -f $input || -p _) {
                                push @{$sync->{no}}, $input if $sync;
                                push @f, $input;
-                       } elsif (-d $input) {
+                       } elsif (-d "$input/new" && -d "$input/cur") {
                                if ($sync) {
-                                       $input = $lei->abs_path($input);
+                                       $input = 'maildir:'.
+                                               $lei->abs_path($input);
                                        push @{$sync->{ok}}, $input;
                                }
-                               push @d, $input;
+                               push @md, $input;
                        } else {
                                return $lei->fail("Unable to handle $input")
                        }
                }
        }
        if (@f) { check_input_format($lei, \@f) or return }
-       if (@d) { # TODO: check for MH vs Maildir, here
-               require PublicInbox::MdirReader;
-       }
        if ($sync && $sync->{no}) {
                return $lei->fail(<<"") if !$sync->{ok};
 --mail-sync specified but no inputs support it
@@ -298,6 +329,13 @@ $input is `eml', not --in-format=$in_fmt
                $lei->{auth} //= PublicInbox::LeiAuth->new;
                $lei->{net} //= $net;
        }
+       if (scalar(@md)) {
+               require PublicInbox::MdirReader;
+               if ($self->can('pmdir_cb')) {
+                       require PublicInbox::LeiPmdir;
+                       $self->{pmd} = PublicInbox::LeiPmdir->new($lei, $self);
+               }
+       }
        $self->{inputs} = $inputs;
 }
 
@@ -334,6 +372,7 @@ sub input_only_net_merge_all_done {
 
 # like Getopt::Long, but for +kw:FOO and -kw:FOO to prepare
 # for update_xvmd -> update_vmd
+# returns something like { "+L" => [ @Labels ], ... }
 sub vmd_mod_extract {
        my $argv = $_[-1];
        my $vmd_mod = {};