X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FWwwStream.pm;h=fd558e1b799bb45c8a86797f6b78d0afdcab483a;hb=89ebf169c3d5edd4f0c19124d586f076fb8d43b2;hp=fceef745d0c4ec2291448a2ff131a68880030530;hpb=d27de5b3df43f41c4e8f3b1cbad79b2436d2a549;p=public-inbox.git

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index fceef745..fd558e1b 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -8,8 +8,11 @@
 # more common "push" model)
 package PublicInbox::WwwStream;
 use strict;
-use warnings;
+use parent qw(Exporter);
+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';
 
@@ -23,26 +26,23 @@ sub base_url ($) {
 	$base_url;
 }
 
-sub new {
-	my ($class, $ctx, $cb) = @_;
-
-	bless {
-		nr => 0,
-		cb => $cb,
-		ctx => $ctx,
-		base_url => base_url($ctx),
-	}, $class;
+sub init {
+	my ($ctx, $cb) = @_;
+	$ctx->{cb} = $cb;
+	$ctx->{base_url} = base_url($ctx);
+	bless $ctx, __PACKAGE__;
 }
 
 sub response {
-	my ($class, $ctx, $code, $cb) = @_;
-	[ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ],
-	  $class->new($ctx, $cb) ]
+	my ($ctx, $code, $cb) = @_;
+	my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
+	init($ctx, $cb);
+	$ctx->{gzf} = gzf_maybe($h, $ctx->{env});
+	[ $code, $h, $ctx ]
 }
 
-sub _html_top ($) {
-	my ($self) = @_;
-	my $ctx = $self->{ctx};
+sub html_top ($) {
+	my ($ctx) = @_;
 	my $ibx = $ctx->{-inbox};
 	my $desc = ascii_html($ibx->description);
 	my $title = delete($ctx->{-title_html}) // $desc;
@@ -83,14 +83,13 @@ sub code_footer ($) {
 }
 
 sub _html_end {
-	my ($self) = @_;
+	my ($ctx) = @_;
 	my $urls = 'Archives are clonable:';
-	my $ctx = $self->{ctx};
 	my $ibx = $ctx->{-inbox};
 	my $desc = ascii_html($ibx->description);
 
 	my @urls;
-	my $http = $self->{base_url};
+	my $http = $ctx->{base_url};
 	my $max = $ibx->max_git_epoch;
 	my $dir = (split(m!/!, $http))[-1];
 	my %seen = ($http => 1);
@@ -157,27 +156,36 @@ EOF
 
 # callback for HTTP.pm (and any other PSGI servers)
 sub getline {
-	my ($self) = @_;
-	my $nr = $self->{nr}++;
-
-	return _html_top($self) if $nr == 0;
+	my ($ctx) = @_;
+	my $cb = $ctx->{cb};
+	my $buf = $cb->($ctx) if $cb;
+	$buf //= delete($ctx->{cb}) ? _html_end($ctx) : undef;
 
-	if (my $middle = $self->{cb}) {
-		$middle = $middle->($nr, $self->{ctx}) and return $middle;
-	}
+	# gzf may be GzipFilter, `undef' or `0'
+	my $gzf = $ctx->{gzf} or return $buf;
 
-	delete $self->{cb} ? _html_end($self) : undef;
+	return $gzf->translate($buf) if defined $buf;
+	$ctx->{gzf} = 0; # next call to ->getline returns $buf (== undef)
+	$gzf->translate(undef);
 }
 
-sub oneshot {
-	my ($ctx, $code, $strref) = @_;
-	my $self = bless {
-		ctx => $ctx,
-		base_url => base_url($ctx),
-	}, __PACKAGE__;
-	[ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], [
-		_html_top($self), $strref ? $$strref : (), _html_end($self)
-	] ]
+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',
+		'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 ]
 }
 
 1;