"../${\mid_href($smsg->{mid})}/" : '';
if (_msg_page_prepare($eml, $ctx)) {
$eml->each_part(\&add_text_body, $ctx, 1);
- $ctx->zmore('</pre><hr>');
+ print { $ctx->{zfh} } '</pre><hr>';
}
html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
- delete($ctx->{obuf}) // \'';
+ ''; # XXX TODO cleanup
} else { # called by WwwStream::async_next or getline
$ctx->{smsg}; # may be undef
}
PublicInbox::WwwStream::init($ctx);
if (_msg_page_prepare($eml, $ctx)) { # sets {-title_html}
$eml->each_part(\&add_text_body, $ctx, 1);
- $ctx->zmore('</pre><hr>');
+ print { $ctx->{zfh} } '</pre><hr>';
}
html_footer($ctx, $eml);
$ctx->html_done;
my $html = ascii_html($irt);
$rv .= qq(In-Reply-To: <<a\nhref="$href">$html</a>>\n)
}
- $rv .= "\n";
+ say { $ctx->zfh } $rv;
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
$ctx->{changed_href} = "#e$id"; # for diffstat "files? changed,"
- $ctx->{obuf} = \$rv;
$eml->each_part(\&add_text_body, $ctx, 1); # expensive
- $ctx->zmore; # TODO: remove once add_text_body is updated
# add the footer
$rv = "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
sub thread_eml_entry {
my ($ctx, $eml) = @_;
my ($beg, $end) = thread_adj_level($ctx, $ctx->{level});
- $ctx->zmore($beg.'<pre>');
- eml_entry($ctx, $eml) . '</pre>' . $end;
+ print { $ctx->zfh } $beg, '<pre>';
+ print { $ctx->{zfh} } eml_entry($ctx, $eml), '</pre>', $end;
}
sub next_in_queue ($$) {
if (!$ghost_ok) { # first non-ghost
$ctx->{-title_html} =
ascii_html($smsg->{subject});
- $ctx->zmore($ctx->html_top);
+ print { $ctx->zfh } $ctx->html_top;
}
return $smsg;
}
# buffer the ghost entry and loop
- $ctx->zmore(ghost_index_entry($ctx, $lvl, $smsg));
+ print { $ctx->zfh } ghost_index_entry($ctx, $lvl, $smsg)
} else { # all done
- $ctx->zmore(join('', thread_adj_level($ctx, 0)));
- $ctx->zmore(${delete($ctx->{skel})});
+ print { $ctx->zfh } thread_adj_level($ctx, 0),
+ ${delete($ctx->{skel})};
return;
}
}
my $smsg = $ctx->{smsg};
if (exists $ctx->{-html_tip}) {
$ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->zmore($ctx->html_top);
+ print { $ctx->zfh } $ctx->html_top;
}
return eml_entry($ctx, $eml);
} else {
return $smsg if exists($smsg->{blob});
}
my $skel = delete($ctx->{skel}) or return; # all done
- $ctx->zmore($$skel);
+ print { $ctx->zfh } $$skel;
undef;
}
}
my ($part, $depth, $idx) = @$p;
my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
- my $rv = $ctx->{obuf};
my ($s, $err) = msg_part_text($part, $ct);
- $s // return $$rv .= (attach_link($ctx, $ct, $p, $fn) // '');
- if ($part->{is_submsg}) {
- $$rv .= submsg_hdr($ctx, $part);
- $$rv .= "\n";
- }
+ my $zfh = $ctx->zfh;
+ $s // return print $zfh (attach_link($ctx, $ct, $p, $fn) // '');
+ say $zfh submsg_hdr($ctx, $part) if $part->{is_submsg};
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
undef $s; # free memory
if (defined($fn) || ($depth > 0 && !$part->{is_submsg}) || $err) {
# badly-encoded message with $err? tell the world about it!
- $$rv .= attach_link($ctx, $ct, $p, $fn, $err);
- $$rv .= "\n";
+ say $zfh attach_link($ctx, $ct, $p, $fn, $err);
}
delete $part->{bdy}; # save memory
- foreach my $cur (@sections) {
+ for my $cur (@sections) { # $cur may be huge
if ($cur =~ /\A>/) {
# we use a <span> here to allow users to specify
# their own color for quoted text
- $$rv .= qq(<span\nclass="q">);
- $$rv .= $l->to_html($cur);
- $$rv .= '</span>';
+ print $zfh qq(<span\nclass="q">),
+ $l->to_html($cur), '</span>';
} elsif ($diff) {
flush_diff($ctx, \$cur);
- } else {
- # regular lines, OK
- $$rv .= $l->to_html($cur);
+ } else { # regular lines, OK
+ print $zfh $l->to_html($cur);
}
undef $cur; # free memory
}
$hbuf .= qq[Message-ID: <$x> (<a href="raw">raw</a>)\n];
}
if (!$nr) { # first (and only) message, common case
- $ctx->zmore($ctx->html_top, $hbuf);
+ print { $ctx->zfh } $ctx->html_top, $hbuf;
} else {
delete $ctx->{-title_html};
- $ctx->zmore($ctx->{-html_tip}, $hbuf);
+ print { $ctx->zfh } $ctx->{-html_tip}, $hbuf;
}
$ctx->{-linkify} //= PublicInbox::Linkify->new;
$hbuf = '';
$hbuf .= "$h: $_\n" for ($eml->header_raw($h));
}
$ctx->{-linkify}->linkify_mids('..', \$hbuf, 1); # escapes HTML
- $ctx->zmore($hbuf);
+ print { $ctx->{zfh} } $hbuf;
$hbuf = '';
}
my @irt = $eml->header_raw('In-Reply-To');
$hbuf .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs;
}
$ctx->{-linkify}->linkify_mids('..', \$hbuf); # escapes HTML
- $ctx->zmore($hbuf .= "\n");
- ${$ctx->{obuf}} = ''; # TODO remove
+ say { $ctx->{zfh} } $hbuf;
1;
}
$ctx->{parent_msg} = $parent;
}
-# appends to obuf
+# writes to zbuf
sub html_footer {
my ($ctx, $hdr) = @_;
my $upfx = '../';
- my ($related, $skel);
+ my (@related, $skel);
+ my $foot = '<pre>';
my $qry = delete $ctx->{-qry};
if ($qry && $ctx->{ibx}->isrch) {
my $q = ''; # search for either ancestor or descendent patches
$q = wrap('', '', $q);
my $rows = ($q =~ tr/\n/\n/) + 1;
$q = ascii_html($q);
- $related = <<EOM;
+ $related[0] = <<EOM;
<form id=related
action=$upfx
><pre>find likely ancestor, descendant, or conflicting patches for <a
if ($ctx->{ibx}->over) {
my $t = ts2str($ctx->{-t_max});
my $t_fmt = fmt_ts($ctx->{-t_max});
- my $fallback =
$related ? "\t" : "<a id=related>\t</a>";
+ my $fallback =
@related ? "\t" : "<a id=related>\t</a>";
$skel = <<EOF;
${fallback}other threads:[<a
href="$upfx?t=$t">~$t_fmt UTC</a>|<a
href="$upfx">newest</a>]
EOF
-
thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
if (my $n = $ctx->{next_msg}) {
$n = mid_href($n);
- $next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
+ $next = qq(<a\nhref="$upfx$n/"\nrel=next>next</a>);
}
- my $u;
my $par = $ctx->{parent_msg};
- if ($par) {
- $u = mid_href($par);
- $u = "$upfx$u/";
- }
+ my $u = $par ? $upfx.mid_href($par).'/' : undef;
if (my $p = $ctx->{prev_msg}) {
$prev = mid_href($p);
if ($p && $par && $p eq $par) {
- $prev = "<a\nhref=\"$upfx$prev/\"\n" .
+ $prev = qq(<a\nhref="$upfx$prev/"\n) .
'rel=prev>prev parent</a>';
$parent = '';
} else {
- $prev = "<a\nhref=\"$upfx$prev/\"\n" .
+ $prev = qq(<a\nhref="$upfx$prev/"\n) .
'rel=prev>prev</a>';
- $parent = " <a\nhref=\"$u\">parent</a>" if $u;
+ $parent = qq( <a\nhref="$u">parent</a>) if $u;
}
} elsif ($u) { # unlikely
- $parent = " <a\nhref=\"$u\"\nrel=prev>parent</a>";
+ $parent = qq( <a\nhref="$u"\nrel=prev>parent</a>);
}
- ${$ctx->{obuf}} .= "<pre>$next $prev$parent ";
+ $foot .= "$next $prev$parent ";
} else { # unindexed inboxes w/o over
- ${$ctx->{obuf}} .= '<pre>';
$skel = qq( <a\nhref="$upfx">latest</a>);
}
- ${$ctx->{obuf}} .= qq(<a\nhref="#R">reply</a>);
- # $skel may be big for big threads, don't append it to obuf
- $skel .= '</pre>' . ($related // '');
- $ctx->zmore($skel .= msg_reply($ctx, $hdr)); # flushes obuf
+ # $skel may be big for big threads, don't append it to $foot
+ print { $ctx->zfh } $foot, qq(<a\nhref="#R">reply</a>),
+ $skel, '</pre>', @related,
+ msg_reply($ctx, $hdr);
}
sub ghost_parent {