wwwstream: subclass off GzipFilter

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index c80440d14dad6291abdc0fe091c7f9011c9e1eb7..42fb183f482152d211dd9fe32a038fc2740097c3 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -8,12 +8,10 @@
 # more common "push" model)
 package PublicInbox::WwwStream;
 use strict;
-use warnings;
-use base qw(Exporter);
+use parent qw(Exporter PublicInbox::GzipFilter);
 our @EXPORT_OK = qw(html_oneshot);
 use bytes (); # length
 use PublicInbox::Hval qw(ascii_html prurl);
-use PublicInbox::GzipFilter qw(gzf_maybe);
 our $TOR_URL = 'https://www.torproject.org/';
 our $CODE_URL = 'https://public-inbox.org/public-inbox.git';
 
@@ -31,19 +29,18 @@ sub init {
        my ($ctx, $cb) = @_;
        $ctx->{cb} = $cb;
        $ctx->{base_url} = base_url($ctx);
-       $ctx->{nr} = 0;
        bless $ctx, __PACKAGE__;
 }
 
 sub response {
        my ($ctx, $code, $cb) = @_;
-       my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
+       my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8' ];
        init($ctx, $cb);
-       $ctx->{gzf} = gzf_maybe($h, $ctx->{env});
-       [ $code, $h, $ctx ]
+       $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env});
+       [ $code, $res_hdr, $ctx ]
 }
 
-sub _html_top ($) {
+sub html_top ($) {
        my ($ctx) = @_;
        my $ibx = $ctx->{-inbox};
        my $desc = ascii_html($ibx->description);
@@ -159,41 +156,27 @@ EOF
 # callback for HTTP.pm (and any other PSGI servers)
 sub getline {
        my ($ctx) = @_;
-       my $nr = $ctx->{nr}++;
-
-       my $buf = do {
-               if ($nr == 0) {
-                       _html_top($ctx);
-               } elsif (my $middle = $ctx->{cb}) {
-                       $middle->($nr, $ctx);
-               }
-       } // (delete($ctx->{cb}) ? _html_end($ctx) : undef);
-
-       # gzf may be GzipFilter, `undef' or `0'
-       my $gzf = $ctx->{gzf} or return $buf;
-
-       return $gzf->translate($buf) if defined $buf;
-       $ctx->{gzf} = 0; # next call to ->getline returns $buf (== undef)
-       $gzf->translate(undef);
+       my $cb = $ctx->{cb} or return;
+       if (defined(my $buf = $cb->($ctx))) {
+               return $ctx->translate($buf);
+       }
+       delete $ctx->{cb};
+       $ctx->zflush(_html_end($ctx));
 }
 
 sub html_oneshot ($$;$) {
        my ($ctx, $code, $sref) = @_;
        $ctx->{base_url} = base_url($ctx);
        bless $ctx, __PACKAGE__;
-       my @x;
-       my $h = [ 'Content-Type' => 'text/html; charset=UTF-8',
+       my @bdy;
+       my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8',
                'Content-Length' => undef ];
-       if (my $gzf = gzf_maybe($h, $ctx->{env})) {
-               $gzf->zmore(_html_top($ctx));
-               $gzf->zmore($$sref) if $sref;
-               $x[0] = $gzf->zflush(_html_end($ctx));
-               $h->[3] = length($x[0]);
-       } else {
-               @x = (_html_top($ctx), $sref ? $$sref : (), _html_end($ctx));
-               $h->[3] += bytes::length($_) for @x;
-       }
-       [ $code, $h, \@x ]
+       $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env});
+       $ctx->zmore(html_top($ctx));
+       $ctx->zmore($$sref) if $sref;
+       $bdy[0] = $ctx->zflush(_html_end($ctx));
+       $res_hdr->[3] = bytes::length($bdy[0]);
+       [ $code, $res_hdr, \@bdy ]
 }
 
 1;