Like with WwwAtomStream and MboxGz, we can bless the existing
$ctx object directly to avoid allocating a new hashref. We'll
also switch from "->" to "::" to reduce stack utilization.
my ($out, $ctx) = @_;
require PublicInbox::WwwStream;
$ctx->{www} = My::MockObject->new(style => '');
my ($out, $ctx) = @_;
require PublicInbox::WwwStream;
$ctx->{www} = My::MockObject->new(style => '');
- my $www_stream = PublicInbox::WwwStream->new($ctx);
+ my $www_stream = PublicInbox::WwwStream::init($ctx);
print $out $www_stream->_html_top, '<pre>' or die;
}
print $out $www_stream->_html_top, '<pre>' or die;
}
$ctx->{-html_tip} = '<pre>';
$ctx->{-upfx} = '';
$ctx->{-hr} = 1;
$ctx->{-html_tip} = '<pre>';
$ctx->{-upfx} = '';
$ctx->{-hr} = 1;
- PublicInbox::WwwStream->response($ctx, 200, \&new_html_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&new_html_i);
$cb = mset_summary($ctx, $mset, $q);
}
}
$cb = mset_summary($ctx, $mset, $q);
}
}
- PublicInbox::WwwStream->response($ctx, $code, $cb);
+ PublicInbox::WwwStream::response($ctx, $code, $cb);
}
# display non-nested search results similar to what users expect from
}
# display non-nested search results similar to what users expect from
$ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
multipart_text_as_html($mime, $ctx);
$ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '</pre><hr>');
$ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
multipart_text_as_html($mime, $ctx);
$ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '</pre><hr>');
- PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&msg_page_i);
}
sub msg_page_more { # cold
}
sub msg_page_more { # cold
$ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = thread_eml_entry($ctx, $level, $smsg, $eml);
$ctx->{-queue} = \@q;
$ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = thread_eml_entry($ctx, $level, $smsg, $eml);
$ctx->{-queue} = \@q;
- PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&stream_thread_i);
}
# /$INBOX/$MESSAGE_ID/t/
}
# /$INBOX/$MESSAGE_ID/t/
$ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = '<pre>'.eml_entry($ctx, $smsg, $eml, scalar @$msgs);
$ctx->{msgs} = $msgs;
$ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = '<pre>'.eml_entry($ctx, $smsg, $eml, scalar @$msgs);
$ctx->{msgs} = $msgs;
- PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&thread_html_i);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}
- PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav);
+ PublicInbox::WwwStream::response($ctx, dump_topics($ctx), \&index_nav);
-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);
+ $ctx->{nr} = 0;
+ bless $ctx, __PACKAGE__;
- my ($class, $ctx, $code, $cb) = @_;
+ my ($ctx, $code, $cb) = @_;
my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
- my $self = $class->new($ctx, $cb);
- $self->{gzf} = gzf_maybe($h, $ctx->{env});
- [ $code, $h, $self ]
+ init($ctx, $cb);
+ $ctx->{gzf} = gzf_maybe($h, $ctx->{env});
+ [ $code, $h, $ctx ]
- my ($self) = @_;
- my $ctx = $self->{ctx};
my $ibx = $ctx->{-inbox};
my $desc = ascii_html($ibx->description);
my $title = delete($ctx->{-title_html}) // $desc;
my $ibx = $ctx->{-inbox};
my $desc = ascii_html($ibx->description);
my $title = delete($ctx->{-title_html}) // $desc;
my $urls = 'Archives are clonable:';
my $urls = 'Archives are clonable:';
- my $ctx = $self->{ctx};
my $ibx = $ctx->{-inbox};
my $desc = ascii_html($ibx->description);
my @urls;
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);
my $max = $ibx->max_git_epoch;
my $dir = (split(m!/!, $http))[-1];
my %seen = ($http => 1);
# callback for HTTP.pm (and any other PSGI servers)
sub getline {
# 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) {
my $buf = do {
if ($nr == 0) {
- _html_top($self);
- } elsif (my $middle = $self->{cb}) {
- $middle->($nr, $self->{ctx});
+ _html_top($ctx);
+ } elsif (my $middle = $ctx->{cb}) {
+ $middle->($nr, $ctx);
- } // (delete($self->{cb}) ? _html_end($self) : undef);
+ } // (delete($ctx->{cb}) ? _html_end($ctx) : undef);
# gzf may be GzipFilter, `undef' or `0'
# gzf may be GzipFilter, `undef' or `0'
- my $gzf = $self->{gzf} or return $buf;
+ my $gzf = $ctx->{gzf} or return $buf;
return $gzf->translate($buf) if defined $buf;
return $gzf->translate($buf) if defined $buf;
- $self->{gzf} = 0; # next call to ->getline returns $buf (== undef)
+ $ctx->{gzf} = 0; # next call to ->getline returns $buf (== undef)
$gzf->translate(undef);
}
sub html_oneshot ($$;$) {
my ($ctx, $code, $sref) = @_;
$gzf->translate(undef);
}
sub html_oneshot ($$;$) {
my ($ctx, $code, $sref) = @_;
- my $self = bless {
- ctx => $ctx,
- base_url => base_url($ctx),
- }, __PACKAGE__;
+ $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})) {
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($self));
+ $gzf->zmore(_html_top($ctx));
$gzf->zmore($$sref) if $sref;
$gzf->zmore($$sref) if $sref;
- $x[0] = $gzf->zflush(_html_end($self));
+ $x[0] = $gzf->zflush(_html_end($ctx));
$h->[3] = length($x[0]);
} else {
$h->[3] = length($x[0]);
} else {
- @x = (_html_top($self), $sref ? $$sref : (), _html_end($self));
+ @x = (_html_top($ctx), $sref ? $$sref : (), _html_end($ctx));
$h->[3] += bytes::length($_) for @x;
}
[ $code, $h, \@x ]
$h->[3] += bytes::length($_) for @x;
}
[ $code, $h, \@x ]