X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=0753c06ee4f81b4a4494ab05210b6bc60e71073a;hb=ab9c03ff4aa369b397dc1a8c8936153c8565fd05;hp=3282d4f993edc6281c75ac00127e40f8f5a359d4;hpb=41c999da8f25bbe822366ffe4ac65c953ea40679;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 3282d4f9..0753c06e 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -38,12 +38,12 @@ sub msg_page_i { : $ctx->gone('over'); $ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ? "../${\mid_href($smsg->{mid})}/" : ''; - if (_msg_page_prepare_obuf($eml, $ctx)) { + if (_msg_page_prepare($eml, $ctx)) { $eml->each_part(\&add_text_body, $ctx, 1); - $ctx->zmore('
'); - eml_entry($ctx, $eml) . '' . $end; + print { $ctx->zfh } $beg, '
'; + print { $ctx->{zfh} } eml_entry($ctx, $eml), '', $end; } sub next_in_queue ($$) { @@ -416,15 +413,15 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback 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; } } @@ -493,7 +490,7 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback 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 { @@ -501,7 +498,7 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback return $smsg if exists($smsg->{blob}); } my $skel = delete($ctx->{skel}) or return; # all done - $ctx->zmore($$skel); + print { $ctx->zfh } $$skel; undef; } } @@ -561,13 +558,10 @@ sub add_text_body { # callback for each_part 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' @@ -615,32 +609,27 @@ sub add_text_body { # callback for each_part 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 here to allow users to specify # their own color for quoted text - $$rv .= qq(); - $$rv .= $l->to_html($cur); - $$rv .= ''; + print $zfh qq(), + $l->to_html($cur), ''; } 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 } } -sub _msg_page_prepare_obuf { +sub _msg_page_prepare { my ($eml, $ctx) = @_; my $have_over = !!$ctx->{ibx}->over; - my $obfs_ibx = $ctx->{-obfs_ibx}; - $ctx->{obuf} = \(my $rv = ''); my $mids = mids_for_index($eml); my $nr = $ctx->{nr}++; if ($nr) { # unlikely @@ -648,80 +637,85 @@ sub _msg_page_prepare_obuf { warn "W: BUG? @$mids not deduplicated properly\n"; return; } - $rv .= + $ctx->{-html_tip} = "
WARNING: multiple messages have this Message-ID\n
"; } else { $ctx->{first_hdr} = $eml->header_obj; $ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID - $rv .= ""; # anchor for body start + $ctx->{-html_tip} = ""; # anchor for body start } $ctx->{-upfx} = '../'; my @title; # (Subject[0], From[0]) + my $hbuf = ''; for my $v ($eml->header('From')) { my @n = PublicInbox::Address::names($v); - $v = ascii_html($v); - $title[1] //= ascii_html(join(', ', @n)); - if ($obfs_ibx) { - obfuscate_addrs($obfs_ibx, $v); - obfuscate_addrs($obfs_ibx, $title[1]); - } - $rv .= "From: $v\n" if $v ne ''; + $title[1] //= join(', ', @n); + $hbuf .= "From: $v\n" if $v ne ''; } - foreach my $h (qw(To Cc)) { + for my $h (qw(To Cc)) { for my $v ($eml->header($h)) { fold_addresses($v); - $v = ascii_html($v); - obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; - $rv .= "$h: $v\n" if $v ne ''; + $hbuf .= "$h: $v\n" if $v ne ''; } } my @subj = $eml->header('Subject'); - if (@subj) { - my $v = ascii_html(shift @subj); - obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; - $rv .= 'Subject: '; - $rv .= $have_over ? qq($v\n) : "$v\n"; - $title[0] = $v; - for $v (@subj) { # multi-Subject message :< - $v = ascii_html($v); - obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; - $rv .= "Subject: $v\n"; - } - } else { # dummy anchor for thread skeleton at bottom of page - $rv .= qq() if $have_over; - $title[0] = '(no subject)'; - } - for my $v ($eml->header('Date')) { - $v = ascii_html($v); - obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P - $rv .= qq{Date: $v\n}; + $hbuf .= "Subject: $_\n" for @subj; + $title[0] = $subj[0] // '(no subject)'; + $hbuf .= "Date: $_\n" for $eml->header('Date'); + $hbuf = ascii_html($hbuf); + $ctx->{-title_html} = ascii_html(join(' - ', @title)); + if (my $obfs_ibx = $ctx->{-obfs_ibx}) { + obfuscate_addrs($obfs_ibx, $hbuf); + obfuscate_addrs($obfs_ibx, $ctx->{-title_html}); } + # [thread overview] link is typically added after Date, # but added after Subject, or even nothing. if ($have_over) { - chop $rv; # drop "\n", or noop if $rv eq '' - $rv .= qq{\t[thread overview]\n}; + chop $hbuf; # drop "\n", or noop if $rv eq '' + $hbuf .= qq{\t[thread overview]\n}; + $hbuf =~ s!^Subject:\x20(.*?)(\n[A-Z]|\z) + !Subject: $1$2!msx or + $hbuf .= qq(); + } + if (scalar(@$mids) == 1) { # common case + my $x = ascii_html($mids->[0]); + $hbuf .= qq[Message-ID: <$x> (raw)\n]; } if (!$nr) { # first (and only) message, common case - $ctx->{-title_html} = join(' - ', @title); - $rv = $ctx->html_top . $rv; + print { $ctx->zfh } $ctx->html_top, $hbuf; + } else { + delete $ctx->{-title_html}; + print { $ctx->zfh } $ctx->{-html_tip}, $hbuf; } - $ctx->{-linkify} //= PublicInbox::Linkify->new; - if (scalar(@$mids) == 1) { # common case - my $mhtml = ascii_html($mids->[0]); - $rv .= qq[Message-ID: <$mhtml> (raw)\n]; - } else { + $hbuf = ''; + if (scalar(@$mids) != 1) { # unlikely, but it happens :< # X-Alt-Message-ID can happen if a message is injected from # public-inbox-nntpd because of multiple Message-ID headers. - my $s = ''; for my $h (qw(Message-ID X-Alt-Message-ID)) { - $s .= "$h: $_\n" for ($eml->header_raw($h)); + $hbuf .= "$h: $_\n" for ($eml->header_raw($h)); } - $ctx->{-linkify}->linkify_mids('..', \$s, 1); - $rv .= $s; + $ctx->{-linkify}->linkify_mids('..', \$hbuf, 1); # escapes HTML + print { $ctx->{zfh} } $hbuf; + $hbuf = ''; + } + my @irt = $eml->header_raw('In-Reply-To'); + my $refs; + if (!@irt) { + $refs = references($eml); + $irt[0] = pop(@$refs) if scalar @$refs; } - $rv .= _parent_headers($ctx, $eml); + $hbuf .= "In-Reply-To: $_\n" for @irt; + + # do not display References: if search is present, + # we show the thread skeleton at the bottom, instead. + if (!$have_over) { + $refs //= references($eml); + $hbuf .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs; + } + $ctx->{-linkify}->linkify_mids('..', \$hbuf); # escapes HTML + say { $ctx->{zfh} } $hbuf; 1; } @@ -771,32 +765,12 @@ sub thread_skel ($$$) { $ctx->{parent_msg} = $parent; } -sub _parent_headers { - my ($ctx, $hdr) = @_; - my @irt = $hdr->header_raw('In-Reply-To'); - my $refs; - my $s = ''; - if (!@irt) { - $refs = references($hdr); - $irt[0] = pop(@$refs) if scalar @$refs; - } - $s .= "In-Reply-To: $_\n" for @irt; - - # do not display References: if search is present, - # we show the thread skeleton at the bottom, instead. - if (!$ctx->{ibx}->over) { - $refs //= references($hdr); - $s .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs; - } - $ctx->{-linkify}->linkify_mids('..', \$s); # escapes HTML - $s .= "\n"; -} - -# appends to obuf +# writes to zbuf sub html_footer { my ($ctx, $hdr) = @_; my $upfx = '../'; - my ($related, $skel); + my (@related, $skel); + my $foot = ''; my $qry = delete $ctx->{-qry}; if ($qry && $ctx->{ibx}->isrch) { my $q = ''; # search for either ancestor or descendent patches @@ -810,7 +784,7 @@ sub html_footer { $q = wrap('', '', $q); my $rows = ($q =~ tr/\n/\n/) + 1; $q = ascii_html($q); - $related = < find likely ancestor, descendant, or conflicting patches for {ibx}->over) { my $t = ts2str($ctx->{-t_max}); my $t_fmt = fmt_ts($ctx->{-t_max}); - my $fallback = $related ? "\t" : "\t"; + my $fallback = @related ? "\t" : "\t"; $skel = <~$t_fmt UTC|newest] EOF - thread_skel(\$skel, $ctx, $hdr); my ($next, $prev); my $parent = ' '; @@ -837,37 +810,32 @@ EOF if (my $n = $ctx->{next_msg}) { $n = mid_href($n); - $next = "next"; + $next = qq(next); } - 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 = "prev parent'; $parent = ''; } else { - $prev = "prev'; - $parent = " parent" if $u; + $parent = qq( parent) if $u; } } elsif ($u) { # unlikely - $parent = " parent"; + $parent = qq( parent); } - ${$ctx->{obuf}} .= " $next $prev$parent "; + $foot .= "$next $prev$parent "; } else { # unindexed inboxes w/o over - ${$ctx->{obuf}} .= '', @related, + msg_reply($ctx, $hdr); } sub ghost_parent {'; $skel = qq( latest); } - ${$ctx->{obuf}} .= qq(reply); - # $skel may be big for big threads, don't append it to obuf - $skel .= '' . ($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(reply), + $skel, '