X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=c80440d14dad6291abdc0fe091c7f9011c9e1eb7;hb=52a02a813a46940530183ede4d4cc7028290cd8f;hp=a4ba1fff6a35d298818e4d6981477f27e99bd56d;hpb=c3d8c3df9f91aead9f6c24e1402b24e02c6a6def;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index a4ba1fff..c80440d1 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
#
# HTML body stream for which yields getline+close methods
@@ -9,35 +9,42 @@
package PublicInbox::WwwStream;
use strict;
use warnings;
+use base 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';
# noop for HTTP.pm (and any other PSGI servers)
sub close {}
-sub new {
- my ($class, $ctx, $cb) = @_;
-
+sub base_url ($) {
+ my $ctx = shift;
my $base_url = $ctx->{-inbox}->base_url($ctx->{env});
chop $base_url; # no trailing slash for clone
- bless {
- nr => 0,
- cb => $cb || \&close,
- ctx => $ctx,
- base_url => $base_url,
- }, $class;
+ $base_url;
+}
+
+sub init {
+ my ($ctx, $cb) = @_;
+ $ctx->{cb} = $cb;
+ $ctx->{base_url} = base_url($ctx);
+ $ctx->{nr} = 0;
+ 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};
+ my ($ctx) = @_;
my $ibx = $ctx->{-inbox};
my $desc = ascii_html($ibx->description);
my $title = delete($ctx->{-title_html}) // $desc;
@@ -78,14 +85,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);
@@ -152,16 +158,42 @@ EOF
# callback for HTTP.pm (and any other PSGI servers)
sub getline {
- my ($self) = @_;
- my $nr = $self->{nr}++;
+ 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);
- return _html_top($self) if $nr == 0;
+ # gzf may be GzipFilter, `undef' or `0'
+ my $gzf = $ctx->{gzf} or return $buf;
- if (my $middle = $self->{cb}) {
- $middle = $middle->($nr, $self->{ctx}) and return $middle;
- }
+ return $gzf->translate($buf) if defined $buf;
+ $ctx->{gzf} = 0; # next call to ->getline returns $buf (== undef)
+ $gzf->translate(undef);
+}
- delete $self->{cb} ? _html_end($self) : undef;
+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;