lei: show {pct} and {oid} in From_ lines and filenames

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

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index dcc3088ba8f35e4b45fdf8eefffbb8b6c6f5bb51..7a4fa85740c3d8b4f5442e10934e5a99ab7ffa71 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -42,12 +42,10 @@ sub detect_fmt ($$) {
        my ($lei, $dst) = @_;
        if ($dst =~ m!\A([:/]+://)!) {
                $lei->fail("$1 support not implemented, yet\n");
-       } elsif (!-e $dst) {
-               'maildir'; # the default
+       } elsif (!-e $dst || -d _) {
+               'maildir'; # the default TODO: MH?
        } elsif (-f _ || -p _) {
                $lei->fail("unable to determine mbox family of $dst\n");
-       } elsif (-d _) { # TODO: MH?
-               'maildir';
        } else {
                $lei->fail("unable to determine format of $dst\n");
        }
@@ -137,11 +135,9 @@ sub _unbless_smsg {
        delete @$smsg{qw(lines bytes num tid)};
        $smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt
        $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate
-       $smsg->{relevance} = get_pct($mitem) if $mitem;
-
+       $smsg->{pct} = get_pct($mitem) if $mitem;
        if (my $r = delete $smsg->{references}) {
-               $smsg->{refs} = [
-                               map { "<$_>" } ($r =~ m/$MID_EXTRACT/go) ];
+               $smsg->{refs} = [ map { "<$_>" } ($r =~ m/$MID_EXTRACT/go) ];
        }
        if (my $m = delete($smsg->{mid})) {
                $smsg->{'m'} = "<$m>";
@@ -228,9 +224,9 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                my $git_dir = $git->{git_dir};
                sub {
                        my ($smsg, $mitem) = @_;
-                       my $kw = []; # TODO get from mitem
-                       $l2m->wq_do('write_mail', \@io, $git_dir,
-                                       $smsg->{blob}, $lei_ipc, $kw)
+                       $smsg->{pct} = get_pct($mitem) if $mitem;
+                       $l2m->wq_do('write_mail', \@io, $git_dir, $smsg,
+                                       $lei_ipc);
                }
        } elsif ($l2m) {
                my $wcb = $l2m->write_cb($lei);
@@ -239,8 +235,8 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                my $g2m = $l2m->can('git_to_mail');
                sub {
                        my ($smsg, $mitem) = @_;
-                       my $kw = []; # TODO get from mitem
-                       $git->cat_async($smsg->{blob}, $g2m, [ $wcb, $kw ]);
+                       $smsg->{pct} = get_pct($mitem) if $mitem;
+                       $git->cat_async($smsg->{blob}, $g2m, [ $wcb, $smsg ]);
                };
        } elsif ($self->{fmt} =~ /\A(concat)?json\z/ && $lei->{opt}->{pretty}) {
                my $EOR = ($1//'') eq 'concat' ? "\n}" : "\n},";
@@ -270,7 +266,6 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                $lei->{ovv_buf} = \(my $buf = '');
                sub {
                        my ($smsg, $mitem) = @_;
-                       delete @$smsg{qw(tid num)};
                        $buf .= $json->encode(_unbless_smsg(@_)) . $ORS;
                        if (length($buf) > 65536) {
                                my $lk = $self->lock_for_scope;