lei: relax rules for "new" in Maildir

mbsync and offlineimap both use ":2," suffixes for filenames in
"new/", however my interpretation of the Maildir spec at
<https://cr.yp.to/proto/maildir.html> is that ":2," is only for
files in "cur/".  My interpretation also matches that of
doveecot, but we'll allow what mbsync and offlineimap do given
their popularity.

2 files changed, 14 insertions, 4 deletions

diff --git a/lib/PublicInbox/LeiMailSync.pm b/lib/PublicInbox/LeiMailSync.pm
index 803de48c..3bada42d 100644
--- a/lib/PublicInbox/LeiMailSync.pm
+++ b/lib/PublicInbox/LeiMailSync.pm
@@ -233,9 +233,16 @@ WHERE b.oidbin = ?
         $b2n->execute(pack('H*', $oidhex));
         while (my ($d, $n) = $b2n->fetchrow_array) {
                 substr($d, 0, length('maildir:')) = '';
-                my $f = "$d/" . ($n =~ /:2,[a-zA-Z]*\z/ ? "cur/$n" : "new/$n");
-                open my $fh, '<', $f or next;
-                if (-s $fh) {
+                # n.b. both mbsync and offlineimap use ":2," as a suffix
+                # in "new/", despite (from what I understand of reading
+                # <https://cr.yp.to/proto/maildir.html>), the ":2," only
+                # applies to files in "cur/".
+                my @try = $n =~ /:2,[a-zA-Z]+\z/ ? qw(cur new) : qw(new cur);
+                for my $x (@try) {
+                        my $f = "$d/$x/$n";
+                        open my $fh, '<', $f or next;
+                        # some (buggy) Maildir writers are non-atomic:
+                        next unless -s $fh;
                         local $/;
                         my $raw = <$fh>;
                         if ($vrfy && git_sha(1, \$raw)->hexdigest ne $oidhex) {
diff --git a/lib/PublicInbox/MdirReader.pm b/lib/PublicInbox/MdirReader.pm
index b49c8ceb..7a0641fb 100644
--- a/lib/PublicInbox/MdirReader.pm
+++ b/lib/PublicInbox/MdirReader.pm
@@ -61,7 +61,10 @@ sub maildir_each_eml {
                 while (defined(my $bn = readdir($dh))) {
                         next if substr($bn, 0, 1) eq '.';
                         my @f = split(/:/, $bn, -1);
-                        next if scalar(@f) != 1;
+
+                        # mbsync and offlineimap both use "2," in "new/"
+                        next if ($f[1] // '2,') ne '2,' || defined($f[2]);
+
                         next if defined($mod) && !shard_ok($bn, $mod, $shard);
                         my $f = $pfx.$bn;
                         my $eml = eml_from_path($f) or next;