www: use WwwStream for dumping thread and search views

This allows us the HTTP server to react to backpressure
from slow clients when writing.  As a side effect, this
also makes it easier for us to maintain a consistent
header/footer across our HTML.

1 files changed, 54 insertions, 52 deletions

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index fbef4116..488822e6 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -8,12 +8,14 @@ use warnings;
 use PublicInbox::SearchMsg;
 use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::View;
-use PublicInbox::MID qw(mid2path mid_mime);
+use PublicInbox::MID qw(mid2path mid_mime mid_clean);
 use Email::MIME;
 require PublicInbox::Git;
 require PublicInbox::Thread;
 our $LIM = 50;
 
+sub noop {}
+
 sub sres_top_html {
         my ($ctx) = @_;
         my $q = PublicInbox::SearchQuery->new($ctx->{qp});
@@ -27,44 +29,46 @@ sub sres_top_html {
                 relevance => $q->{r},
         };
         my ($mset, $total);
-
         eval {
-                $mset = $ctx->{srch}->query($q->{q}, $opts);
+                $mset = $ctx->{srch}->query($q->{'q'}, $opts);
                 $total = $mset->get_matches_estimated;
         };
         my $err = $@;
-        my $res = html_start($q, $ctx) . '<pre>';
+        ctx_prepare($q, $ctx);
+        my $cb;
         if ($err) {
                 $code = 400;
-                $res .= err_txt($ctx, $err) . "</pre><hr /><pre>" . foot($ctx);
+                $ctx->{-html_tip} = '<pre>'.err_txt($ctx, $err).'</pre><hr />';
+                $cb = *noop;
         } elsif ($total == 0) {
                 $code = 404;
-                $res .= "\n\n[No results found]</pre><hr /><pre>".foot($ctx);
+                $ctx->{-html_tip} = "<pre>\n[No results found]</pre><hr />";
+                $cb = *noop;
         } else {
                 my $x = $q->{x};
                 return sub { adump($_[0], $mset, $q, $ctx) } if ($x eq 'A');
 
-                $res .= search_nav_top($mset, $q) . "\n\n";
+                $ctx->{-html_tip} = search_nav_top($mset, $q) . "\n\n";
                 if ($x eq 't') {
-                        return sub { tdump($_[0], $res, $mset, $q, $ctx) };
+                        $cb = mset_thread($ctx, $mset, $q);
+                } else {
+                        $cb = mset_summary($ctx, $mset, $q);
                 }
-                dump_mset(\$res, $mset);
-                $res .= '</pre>' . search_nav_bot($mset, $q) .
-                        "\n\n" . foot($ctx);
         }
 
-        $res .= "</pre></body></html>";
-        [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$res]];
+        [ $code, ['Content-Type', 'text/html; charset=UTF-8'],
+                PublicInbox::WwwStream->new($ctx, $cb) ];
 }
 
 # display non-threaded search results similar to what users expect from
 # regular WWW search engines:
-sub dump_mset {
-        my ($res, $mset) = @_;
+sub mset_summary {
+        my ($ctx, $mset, $q) = @_;
 
         my $total = $mset->get_matches_estimated;
         my $pad = length("$total");
         my $pfx = ' ' x $pad;
+        my $res = \($ctx->{-html_tip});
         foreach my $m ($mset->items) {
                 my $rank = sprintf("%${pad}d", $m->get_rank + 1);
                 my $pct = $m->get_percent;
@@ -77,6 +81,8 @@ sub dump_mset {
                         $s . "</a></b>\n";
                 $$res .= "$pfx  - by $f @ $ts UTC [$pct%]\n\n";
         }
+        $$res .= search_nav_bot($mset, $q);
+        *noop;
 }
 
 sub err_txt {
@@ -85,14 +91,14 @@ sub err_txt {
         $u = PublicInbox::Hval::prurl($ctx->{cgi}->{env}, $u);
         $err =~ s/^\s*Exception:\s*//; # bad word to show users :P
         $err = ascii_html($err);
-        "\n\nBad query: <b>$err</b>\n" .
+        "\nBad query: <b>$err</b>\n" .
                 qq{See <a\nhref="$u">$u</a> for Xapian query syntax};
 }
 
 sub search_nav_top {
         my ($mset, $q) = @_;
 
-        my $rv = "Search results ordered by [";
+        my $rv = "<pre>Search results ordered by [";
         if ($q->{r}) {
                 my $d = $q->qs_html(r => 0);
                 $rv .= qq{<a\nhref="?$d">date</a>|<b>relevance</b>};
@@ -122,7 +128,7 @@ sub search_nav_bot {
         my $o = $q->{o};
         my $end = $o + $nr;
         my $beg = $o + 1;
-        my $rv = "<hr /><pre>Results $beg-$end of $total";
+        my $rv = "</pre><hr /><pre>Results $beg-$end of $total";
         my $n = $o + $LIM;
 
         if ($n < $total) {
@@ -135,13 +141,11 @@ sub search_nav_bot {
                 my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
                 $rv .= qq{<a\nhref="?$qs"\nrel=prev>prev</a>};
         }
-        $rv;
+        $rv .= '</pre>';
 }
 
-sub tdump {
-        my ($cb, $res, $mset, $q, $ctx) = @_;
-        my $fh = $cb->([200, ['Content-Type'=>'text/html; charset=UTF-8']]);
-        $fh->write($res .= '</pre>');
+sub mset_thread {
+        my ($ctx, $mset, $q) = @_;
         my %pct;
         my @m = map {
                 my $i = $_;
@@ -163,14 +167,14 @@ sub tdump {
         } else { # order by time (default for threaded view)
                 $th->order(*PublicInbox::View::sort_ts);
         }
-        my $skel = '';
+        my $skel = search_nav_bot($mset, $q). "<pre>";
+        my $inbox = $ctx->{-inbox};
         my $state = {
-                -inbox => $ctx->{-inbox},
+                -inbox => $inbox,
                 anchor_idx => 1,
                 ctx => $ctx,
                 cur_level => 0,
                 dst => \$skel,
-                fh => $fh,
                 mapping => {},
                 pct => \%pct,
                 prev_attr => '',
@@ -179,42 +183,40 @@ sub tdump {
                 srch => $ctx->{srch},
                 upfx => './',
         };
-        $ctx->{searchview} = 1;
+
         PublicInbox::View::walk_thread($th, $state,
                 *PublicInbox::View::pre_thread);
 
-        PublicInbox::View::thread_entry($state, $_, 0) for @m;
-
-        $fh->write(search_nav_bot($mset, $q). "\n\n" . $skel . "\n" .
-                        foot($ctx). '</pre></body></html>');
-
-        $fh->close;
-}
-
-sub foot {
-        my ($ctx) = @_;
-        my $foot = $ctx->{footer} || '';
-        qq{Back to <a\nhref=".">index</a>.\n$foot};
+        my $msgs = \@m;
+        my $mime;
+        sub {
+                return unless $msgs;
+                while ($mime = shift @$msgs) {
+                        my $mid = mid_clean(mid_mime($mime));
+                        $mime = $inbox->msg_by_mid($mid) and last;
+                }
+                if ($mime) {
+                        $mime = Email::MIME->new($mime);
+                        return PublicInbox::View::index_entry($mime, $state);
+                }
+                $msgs = undef;
+                $skel .= "\n</pre>";
+        };
 }
 
-sub html_start {
+sub ctx_prepare {
         my ($q, $ctx) = @_;
         my $qh = ascii_html($q->{'q'});
-        my $A = $q->qs_html(x => 'A', r => undef);
-        my $res = '<html><head>' . PublicInbox::Hval::STYLE .
-                "<title>$qh - search results</title>" .
-                qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
-                qq!href="?$A"\ntype="application/atom+xml"/></head>! .
-                qq{<body><form\naction="">} .
-                qq{<input\nname=q\nvalue="$qh"\ntype=text />};
-
-        $res .= qq{<input\ntype=hidden\nname=r />} if $q->{r};
+        $ctx->{-q_value_html} = $qh;
+        $ctx->{-atom} = '?'.$q->qs_html(x => 'A', r => undef);
+        $ctx->{-title_html} = "$qh - search results";
+        my $extra = '';
+        $extra .= qq{<input\ntype=hidden\nname=r />} if $q->{r};
         if (my $x = $q->{x}) {
                 $x = ascii_html($x);
-                $res .= qq{<input\ntype=hidden\nname=x\nvalue="$x" />};
+                $extra .= qq{<input\ntype=hidden\nname=x\nvalue="$x" />};
         }
-
-        $res .= qq{<input\ntype=submit\nvalue=search /></form>};
+        $ctx->{-extra_form_html} = $extra;
 }
 
 sub adump {