From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS200052 185.220.101.0/24 X-Spam-Status: No, score=-1.3 required=3.0 tests=BAYES_00,RCVD_IN_XBL, RDNS_NONE,SPF_FAIL,SPF_HELO_FAIL,SUBJ_ALL_CAPS shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from 80x24.org (unknown [185.220.101.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id B77A61F46C for ; Mon, 13 Jan 2020 09:24:32 +0000 (UTC) From: Eric Wong To: spew@80x24.org Subject: [PATCH] WIP Date: Mon, 13 Jan 2020 09:24:25 +0000 Message-Id: <20200113092425.6813-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --- lib/PublicInbox/SearchView.pm | 4 +-- lib/PublicInbox/View.pm | 52 +++++++++++++++++++---------------- lib/PublicInbox/WwwStream.pm | 1 + 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 97233069..14a4aeaa 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -300,8 +300,8 @@ sub mset_thread_i { my $msgs = $ctx->{msgs} or return; while (my $smsg = pop @$msgs) { $ctx->{-inbox}->smsg_mime($smsg) or next; - return PublicInbox::View::index_entry($smsg, $ctx, - scalar @$msgs); + return ${PublicInbox::View::index_entry($smsg, $ctx, + scalar @$msgs)}; } my ($skel) = delete @$ctx{qw(skel msgs)}; $$skel .= "\n"; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index c9e6b3c5..be42c1be 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -208,12 +208,13 @@ sub index_entry { my $obfs_ibx = $ctx->{-obfs_ibx}; $subj = '(no subject)' if $subj eq ''; - my $rv = "* "; + my $obuf = $ctx->{obuf}; + $$obuf .= "* "; $subj = ''.ascii_html($subj).''; obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx; $subj = "$subj" if $root_anchor eq $id_m; - $rv .= $subj . "\n"; - $rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx); + $$obuf .= $subj . "\n"; + $$obuf .= _th_index_lite($mid_raw, \$irt, $id, $ctx); my @tocc; my $ds = $smsg->ds; # for v1 non-Xapian/SQLite users # deleting {mime} is critical to memory use, @@ -223,11 +224,11 @@ sub index_entry { my $hdr = $mime->header_obj; my $from = _hdr_names_html($hdr, 'From'); obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx; - $rv .= "From: $from @ ".fmt_ts($ds)." UTC"; + $$obuf .= "From: $from @ ".fmt_ts($ds)." UTC"; my $upfx = $ctx->{-upfx}; my $mhref = $upfx . mid_escape($mid_raw) . '/'; - $rv .= qq{ (permalink / }; - $rv .= qq{raw)\n}; + $$obuf .= qq{ (permalink / }; + $$obuf .= qq{raw)\n}; my $to = fold_addresses(_hdr_names_html($hdr, 'To')); my $cc = fold_addresses(_hdr_names_html($hdr, 'Cc')); my ($tlen, $clen) = (length($to), length($cc)); @@ -245,32 +246,30 @@ sub index_entry { $to_cc .= "\n"; } obfuscate_addrs($obfs_ibx, $to_cc) if $obfs_ibx; - $rv .= $to_cc; + $$obuf .= $to_cc; my $mapping = $ctx->{mapping}; if (!$mapping && (defined($irt) || defined($irt = in_reply_to($hdr)))) { my $mirt = PublicInbox::Hval->new_msgid($irt); my $href = $upfx . $mirt->{href}. '/'; my $html = $mirt->as_html; - $rv .= qq(In-Reply-To: <$html>\n) + $$obuf .= qq(In-Reply-To: <$html>\n) } - $rv .= "\n"; + $$obuf .= "\n"; # scan through all parts, looking for displayable text $ctx->{mhref} = $mhref; - $ctx->{obuf} = \$rv; msg_iter($mime, \&add_text_body, $ctx, 1); - delete $ctx->{obuf}; # add the footer - $rv .= "\n^ ". + $$obuf .= "\n^ ". "permalink" . " raw" . " reply"; my $hr; if (defined(my $pct = $smsg->{pct})) { # used by SearchView.pm - $rv .= "\t[relevance $pct%]"; + $$obuf .= "\t[relevance $pct%]"; $hr = 1; } elsif ($mapping) { my $nested = 'nested'; @@ -282,15 +281,15 @@ sub index_entry { } else { $nested = "$nested"; } - $rv .= "\t[$flat"; - $rv .= "|$nested]"; - $rv .= " $ctx->{s_nr}"; + $$obuf .= "\t[$flat"; + $$obuf .= "|$nested]"; + $$obuf .= " $ctx->{s_nr}"; } else { $hr = $ctx->{-hr}; } - $rv .= $more ? '
' : '
' if $hr; - $rv; + $$obuf .= $more ? '
' : '
' if $hr; + delete $ctx->{obuf}; } sub pad_link ($$;$) { @@ -392,7 +391,10 @@ sub pre_thread { # walk_thread callback sub thread_index_entry { my ($ctx, $level, $smsg) = @_; my ($beg, $end) = thread_adj_level($ctx, $level); - $beg . '
' . index_entry($smsg, $ctx, 0) . '
' . $end; + my $obuf = $ctx->{obuf}; + $$obuf .= $beg . '
';
+	index_entry($smsg, $ctx, 0);
+	$$obuf .= '
' . $end; } sub stream_thread_i { # PublicInbox::WwwStream::getline callback @@ -475,20 +477,24 @@ sub thread_html { } return missing_thread($ctx) unless $smsg; $ctx->{-title_html} = ascii_html($smsg->subject); - $ctx->{-html_tip} = '
'.index_entry($smsg, $ctx, scalar @$msgs);
+	${$ctx->{obuf}} .= '
';
+	index_entry($smsg, $ctx, scalar @$msgs);
+	$ctx->{-html_tip} = $obuf;
 	$ctx->{msgs} = $msgs;
 	PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i);
 }
 
 sub thread_html_i { # PublicInbox::WwwStream::getline callback
 	my ($nr, $ctx) = @_;
-	my $msgs = $ctx->{msgs} or return;
+	my $msgs = $ctx->{msgs} or return; # final return value
+
 	while (my $smsg = shift @$msgs) {
 		$ctx->{-inbox}->smsg_mime($smsg) or next;
-		return index_entry($smsg, $ctx, scalar @$msgs);
+		return ${index_entry($smsg, $ctx, scalar @$msgs)};
 	}
+
 	my ($skel) = delete @$ctx{qw(skel msgs)};
-	$$skel;
+	$$skel; # penultimate return value
 }
 
 sub multipart_text_as_html {
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index f0a57d6a..fd2cbcff 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -160,6 +160,7 @@ sub getline {
 	return _html_top($self) if $nr == 0;
 
 	if (my $middle = $self->{cb}) {
+		$self->{ctx}->{obuf} = \(my $obuf = '');
 		$middle = $middle->($nr, $self->{ctx}) and return $middle;
 	}