wwwstream: eliminate ::response, use html_oneshot

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

diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 508005fba0ee315b603dd0fb2b365a14d318c092..08691684d99ea5f9fad132ce10e0131f1fbbc752 100644 (file)
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -11,7 +11,6 @@ use PublicInbox::WwwStream;
 use PublicInbox::Hval qw(ascii_html);
 use URI::Escape qw(uri_escape_utf8);
 use PublicInbox::GzipFilter qw(gzf_maybe);
-use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
 our $QP_URL = 'https://xapian.org/docs/queryparser.html';
 our $WIKI_URL = 'https://en.wikipedia.org/wiki';
 my $hl = eval {
@@ -64,25 +63,18 @@ sub get_text {
        # Follow git commit message conventions,
        # first line is the Subject/title
        my ($title) = ($txt =~ /\A([^\n]*)/s);
-       $ctx->{txt} = \$txt;
        $ctx->{-title_html} = ascii_html($title);
        my $nslash = ($key =~ tr!/!/!);
        $ctx->{-upfx} = '../../../' . ('../' x $nslash);
-       PublicInbox::WwwStream->response($ctx, $code, \&_do_linkify);
-}
-
-sub _do_linkify {
-       my ($nr, $ctx) = @_;
-       return unless $nr == 1;
        my $l = PublicInbox::Linkify->new;
-       my $txt = delete $ctx->{txt};
-       $l->linkify_1($$txt);
+       $l->linkify_1($txt);
        if ($hl) {
-               $hl->do_hl_text($txt);
+               $hl->do_hl_text(\$txt);
        } else {
-               $$txt = ascii_html($$txt);
+               $txt = ascii_html($txt);
        }
-       '<pre>' . $l->linkify_2($$txt) . '</pre>';
+       $txt = '<pre>' . $l->linkify_2($txt) . '</pre>';
+       PublicInbox::WwwStream::html_oneshot($ctx, $code, \$txt);
 }
 
 sub _srch_prefix ($$) {