X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiOverview.pm;h=b4d8132855f58f0b6626cc38236b4f22837fb323;hb=43c43f785aa53607a0dd050989da5d7fd0dcfff4;hp=8799f1ccec56fcd5c06f96bf54507f4608934692;hpb=7e947c849e3ceeb89c3d27952abdb10f9252c038;p=public-inbox.git diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 8799f1cc..b4d81328 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -23,19 +23,18 @@ my $JSONL = 'ldjson|ndjson|jsonl'; # 3 names for the same thing sub _iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) } -# we open this in the parent process before ->wq_do handoff +# we open this in the parent process before ->wq_io_do handoff sub ovv_out_lk_init ($) { my ($self) = @_; - $self->{tmp_lk_id} = "$self.$$"; my $tmp = File::Temp->new("lei-ovv.dst.$$.lock-XXXXXX", TMPDIR => 1, UNLINK => 0); - $self->{lock_path} = $tmp->filename; + $self->{"lk_id.$self.$$"} = $self->{lock_path} = $tmp->filename; } sub ovv_out_lk_cancel ($) { my ($self) = @_; - ($self->{tmp_lk_id}//'') eq "$self.$$" and - unlink(delete($self->{lock_path})); + my $lock_path = delete $self->{"lk_id.$self.$$"} or return; + unlink($lock_path); } sub detect_fmt ($$) { @@ -52,18 +51,24 @@ sub detect_fmt ($$) { } sub new { - my ($class, $lei) = @_; + my ($class, $lei, $ofmt_key) = @_; my $opt = $lei->{opt}; my $dst = $opt->{output} // '-'; $dst = '/dev/stdout' if $dst eq '-'; + $ofmt_key //= 'format'; - my $fmt = $opt->{'format'}; + my $fmt = $opt->{$ofmt_key}; $fmt = lc($fmt) if defined $fmt; - if ($dst =~ s/\A([a-z0-9]+)://is) { # e.g. Maildir:/home/user/Mail/ + if ($dst =~ m!\A([a-z0-9\+]+)://!is) { + defined($fmt) and return $lei->fail(<<""); +--$ofmt_key=$fmt invalid with URL $dst + + $fmt = lc $1; + } elsif ($dst =~ s/\A([a-z0-9]+)://is) { # e.g. Maildir:/home/user/Mail/ my $ofmt = lc $1; $fmt //= $ofmt; return $lei->fail(<<"") if $fmt ne $ofmt; ---format=$fmt and --output=$ofmt conflict +--$ofmt_key=$fmt and --output=$ofmt conflict } $fmt //= 'json' if $dst eq '/dev/stdout'; @@ -79,10 +84,8 @@ sub new { if ($fmt =~ /\A($JSONL|(?:concat)?json)\z/) { $json = $self->{json} = ref(PublicInbox::Config->json); } - my ($isatty, $seekable); if ($dst eq '/dev/stdout') { - $isatty = -t $lei->{1}; - $lei->start_pager if $isatty; + my $isatty = $lei->{need_pager} = -t $lei->{1}; $opt->{pretty} //= $isatty; if (!$isatty && -f _) { my $fl = fcntl($lei->{1}, F_GETFL, 0) // @@ -91,14 +94,21 @@ sub new { } else { ovv_out_lk_init($self); } + } elsif (!$opt->{quiet}) { + $lei->{-progress} = 1; } - if (!$json) { + if ($json) { + $lei->{dedupe} //= PublicInbox::LeiDedupe->new($lei); + } else { # default to the cheapest sort since MUA usually resorts - $lei->{opt}->{'sort'} //= 'docid' if $dst ne '/dev/stdout'; + $opt->{'sort'} //= 'docid' if $dst ne '/dev/stdout'; $lei->{l2m} = eval { PublicInbox::LeiToMail->new($lei) }; return $lei->fail($@) if $@; + if ($opt->{mua} && $lei->{l2m}->lock_free) { + $lei->{early_mua} = 1; + $opt->{alert} //= [ ':WINCH,:bell' ] if -t $lei->{1}; + } } - $lei->{dedupe} //= PublicInbox::LeiDedupe->new($lei); $self; } @@ -106,70 +116,53 @@ sub new { sub ovv_begin { my ($self, $lei) = @_; if ($self->{fmt} eq 'json') { - print { $lei->{1} } '['; + $lei->out('['); } # TODO HTML/Atom/... } # called once by parent (via PublicInbox::EOFpipe) sub ovv_end { my ($self, $lei) = @_; - my $out = $lei->{1} or return; if ($self->{fmt} eq 'json') { # JSON doesn't allow trailing commas, and preventing # trailing commas is a PITA when parallelizing outputs - print $out "null]\n"; + $lei->out("null]\n"); } elsif ($self->{fmt} eq 'concatjson') { - print $out "\n"; + $lei->out("\n"); } } -sub ovv_atfork_child { - my ($self) = @_; - # reopen dedupe here -} - # prepares an smsg for JSON sub _unbless_smsg { my ($smsg, $mitem) = @_; - delete @$smsg{qw(lines bytes num tid)}; + # TODO: make configurable + # num/tid are nonsensical with multi-inbox search, + # lines/bytes are not generally useful + delete @$smsg{qw(num tid lines bytes)}; $smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate $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>"; + $smsg->{'m'} = $m; } for my $f (qw(from to cc)) { my $v = delete $smsg->{$f} or next; $smsg->{substr($f, 0, 1)} = pairs($v); } $smsg->{'s'} = delete $smsg->{subject}; - # can we be bothered to parse From/To/Cc into arrays? - scalar { %$smsg }; # unbless + my $kw = delete($smsg->{kw}); + scalar { %$smsg, ($kw && scalar(@$kw) ? (kw => $kw) : ()) }; # unbless } sub ovv_atexit_child { my ($self, $lei) = @_; - if (my $l2m = delete $lei->{l2m}) { - # gracefully stop lei2mail processes after all - # ->write_mail work is complete - delete $l2m->{-wq_s1}; - if (my $rd = delete $l2m->{each_smsg_done}) { - read($rd, my $buf, 1); # wait for EOF - } - } - # order matters, git->{-tmp}->DESTROY must not fire until - # {each_smsg_done} hits EOF above - if (my $git = delete $self->{git}) { - $git->async_wait_all; - } if (my $bref = delete $lei->{ovv_buf}) { - my $out = $lei->{1} or return; my $lk = $self->lock_for_scope; - print $out $$bref; + $lei->out($$bref); } } @@ -187,7 +180,10 @@ sub _json_pretty { $pair =~ s/(null|"),"/$1, "/g; $pair; } @$v) . ']'; - } else { # references + } elsif ($k eq 'kw') { # keywords are short, one-line + $v = $json->encode($v); + $v =~ s/","/", "/g; + } else { # refs, labels, ... $v = '[' . join($sep, map { substr($json->encode([$_]), 1, -1); } @$v) . ']'; @@ -201,48 +197,37 @@ sub _json_pretty { sub ovv_each_smsg_cb { # runs in wq worker usually my ($self, $lei, $ibxish) = @_; - my $json; - $lei->{1}->autoflush(1); + my ($json, $dedupe); if (my $pkg = $self->{json}) { $json = $pkg->new; $json->utf8->canonical; $json->ascii(1) if $lei->{opt}->{ascii}; } my $l2m = $lei->{l2m}; - if ($l2m && $l2m->{-wq_s1}) { - my ($lei_ipc, @io) = $lei->atfork_parent_wq($l2m); - # n.b. $io[0] = qry_status_wr, $io[1] = mbox|stdout, - # $io[4] becomes a notification pipe that triggers EOF - # in this wq worker when all outstanding ->write_mail - # calls are complete - die "BUG: \$io[4] $io[4] unexpected" if $io[4]; - pipe($l2m->{each_smsg_done}, $io[4]) or die "pipe: $!"; - fcntl($io[4], 1031, 4096) if $^O eq 'linux'; - delete @$lei_ipc{qw(l2m opt mset_opt cmd)}; - my $git = $ibxish->git; # (LeiXSearch|Inbox|ExtSearch)->git - $self->{git} = $git; - 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) - } - } elsif ($l2m) { + if (!$l2m) { + $dedupe = $lei->{dedupe} // die 'BUG: {dedupe} missing'; + $dedupe->prepare_dedupe; + } + $lei->{ovv_buf} = \(my $buf = '') if !$l2m; + if ($l2m && !$ibxish) { # remote https?:// mboxrd my $wcb = $l2m->write_cb($lei); - my $git = $ibxish->git; # (LeiXSearch|Inbox|ExtSearch)->git - $self->{git} = $git; # for ovv_atexit_child - 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 ]); + my ($smsg, undef, $eml) = @_; # no mitem in $_[1] + $wcb->(undef, $smsg, $eml); }; + } elsif ($l2m && $l2m->{-wq_s1}) { + sub { + my ($smsg, $mitem) = @_; + $smsg->{pct} = get_pct($mitem) if $mitem; + $l2m->wq_io_do('write_mail', [], $smsg); + } } elsif ($self->{fmt} =~ /\A(concat)?json\z/ && $lei->{opt}->{pretty}) { my $EOR = ($1//'') eq 'concat' ? "\n}" : "\n},"; - $lei->{ovv_buf} = \(my $buf = ''); + my $lse = $lei->{sto}->search; sub { # DIY prettiness :P my ($smsg, $mitem) = @_; + return if $dedupe->is_smsg_dup($smsg); + $lse->xsmsg_vmd($smsg, $smsg->{L} ? undef : 1); $smsg = _unbless_smsg($smsg, $mitem); $buf .= "{\n"; $buf .= join(",\n", map { @@ -255,30 +240,27 @@ sub ovv_each_smsg_cb { # runs in wq worker usually } } sort keys %$smsg); $buf .= $EOR; - if (length($buf) > 65536) { - my $lk = $self->lock_for_scope; - print { $lei->{1} } $buf; - $buf = ''; - } + return if length($buf) < 65536; + my $lk = $self->lock_for_scope; + $lei->out($buf); + $buf = ''; } } elsif ($json) { my $ORS = $self->{fmt} eq 'json' ? ",\n" : "\n"; # JSONL - $lei->{ovv_buf} = \(my $buf = ''); + my $lse = $lei->{sto}->search; sub { my ($smsg, $mitem) = @_; - delete @$smsg{qw(tid num)}; + return if $dedupe->is_smsg_dup($smsg); + $lse->xsmsg_vmd($smsg, $smsg->{L} ? undef : 1); $buf .= $json->encode(_unbless_smsg(@_)) . $ORS; - if (length($buf) > 65536) { - my $lk = $self->lock_for_scope; - print { $lei->{1} } $buf; - $buf = ''; - } - } - } elsif ($self->{fmt} eq 'oid') { - sub { - my ($smsg, $mitem) = @_; + return if length($buf) < 65536; + my $lk = $self->lock_for_scope; + $lei->out($buf); + $buf = ''; } - } # else { ... + } else { + die "TODO: unhandled case $self->{fmt}" + } } no warnings 'once';