From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 05/22] view: reduce parameters for html_footer
Date: Sat, 25 Jan 2020 04:44:53 +0000 [thread overview]
Message-ID: <20200125044510.13769-6-e@yhbt.net> (raw)
In-Reply-To: <20200125044510.13769-1-e@yhbt.net>
Put more logic into html_footer and less in its only caller so
we can control the buffering and string creation.
---
lib/PublicInbox/View.pm | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 0a6903f1..02dd86da 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -40,11 +40,7 @@ sub msg_html_i {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
# here crashes:
- eval {
- my $hdr = delete($ctx->{hdr});
- '<pre>' . html_footer($hdr, 1, $ctx) .
- '</pre>' . msg_reply($ctx, $hdr)
- };
+ eval { html_footer($ctx) };
} else {
undef
}
@@ -113,7 +109,7 @@ sub msg_html_more {
}
# /$INBOX/$MESSAGE_ID/#R
-sub msg_reply {
+sub msg_reply ($$) {
my ($ctx, $hdr) = @_;
my $se_url =
'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
@@ -800,17 +796,17 @@ sub _parent_headers {
$rv;
}
+# returns a string buffer via ->getline
sub html_footer {
- my ($hdr, $standalone, $ctx, $rhref) = @_;
-
- my $ibx = $ctx->{-inbox} if $ctx;
+ my ($ctx) = @_;
+ my $ibx = $ctx->{-inbox};
+ my $hdr = delete $ctx->{hdr};
my $upfx = '../';
- my $tpfx = '';
- my $skel = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
- my $irt = '';
- if ($skel && $ibx->over) {
+ my $skel = " <a\nhref=\"$upfx\">index</a>";
+ my $rv = '<pre>';
+ if ($ibx->over) {
$skel .= "\n";
- thread_skel(\$skel, $ctx, $hdr, $tpfx);
+ thread_skel(\$skel, $ctx, $hdr, '');
my ($next, $prev);
my $parent = ' ';
$next = $prev = ' ';
@@ -839,13 +835,12 @@ sub html_footer {
} elsif ($u) { # unlikely
$parent = " <a\nhref=\"$u\"\nrel=prev>parent</a>";
}
- $irt = "$next $prev$parent ";
- } else {
- $irt = '';
+ $rv .= "$next $prev$parent ";
}
- $rhref ||= '#R';
- $irt .= qq(<a\nhref="$rhref">reply</a>);
- $irt .= $skel;
+ $rv .= qq(<a\nhref="#R">reply</a>);
+ $rv .= $skel;
+ $rv .= '</pre>';
+ $rv .= msg_reply($ctx, $hdr);
}
sub linkify_ref_no_over {
next prev parent reply other threads:[~2020-01-25 4:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-25 4:44 [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
2020-01-25 4:44 ` [PATCH 01/22] www*stream: favor \&close instead of *close Eric Wong
2020-01-25 4:44 ` [PATCH 02/22] www: use "skel" terminology consistently Eric Wong
2020-01-25 4:44 ` [PATCH 03/22] view: improve readability around walk_thread Eric Wong
2020-01-25 4:44 ` [PATCH 04/22] searchview: keep $noop sub private to the package Eric Wong
2020-01-25 4:44 ` Eric Wong [this message]
2020-01-25 4:44 ` [PATCH 06/22] view: thread_skel: drop constant tpfx parameter Eric Wong
2020-01-25 4:44 ` [PATCH 07/22] view: simplify duplicate Message-ID handling Eric Wong
2020-01-25 4:44 ` [PATCH 08/22] wwwstream: discard single-use $ctx fields after use Eric Wong
2020-01-25 4:44 ` [PATCH 09/22] view: start performing buffering into {obuf} Eric Wong
2020-01-25 4:44 ` [PATCH 10/22] t/plack.t: modernize and unindent Eric Wong
2020-01-25 4:44 ` [PATCH 11/22] init: use Import::run_die instead of system() Eric Wong
2020-01-25 4:45 ` [PATCH 12/22] tests: move the majority of t/view.t into t/plack.t Eric Wong
2020-01-25 4:45 ` [PATCH 13/22] xt/perf-msgview: switch to multipart_text_as_html Eric Wong
2020-01-25 4:45 ` [PATCH 14/22] view: inline and eliminate msg_html Eric Wong
2020-01-25 4:45 ` [PATCH 15/22] linkify: compile $LINK_RE once Eric Wong
2020-01-25 4:45 ` [PATCH 16/22] linkify: move to_html over from ViewDiff Eric Wong
2020-01-25 4:45 ` [PATCH 17/22] searchidx: skip filenames on "diff --git ..." Eric Wong
2020-01-25 4:45 ` [PATCH 18/22] searchidx: don't assume "a/" and "b/" as prefixes Eric Wong
2020-01-25 4:45 ` [PATCH 19/22] viewdiff: add "b=" param with non-standard diff prefix Eric Wong
2020-01-25 4:45 ` [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line Eric Wong
2020-01-25 4:45 ` [PATCH 21/22] viewdiff: use autovivification for long_path hash Eric Wong
2020-01-25 4:45 ` [PATCH 22/22] viewdiff: rewrite and simplify Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200125044510.13769-6-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).