From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 06/22] view: thread_skel: drop constant tpfx parameter
Date: Sat, 25 Jan 2020 04:44:54 +0000 [thread overview]
Message-ID: <20200125044510.13769-7-e@yhbt.net> (raw)
In-Reply-To: <20200125044510.13769-1-e@yhbt.net>
It hasn't changed in a few years. Now we can rely on constant
folding to avoid extraneous ops to the $skel buffer.
---
lib/PublicInbox/View.pm | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 02dd86da..8bfa9bec 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -719,32 +719,34 @@ sub _msg_html_prepare {
$rv .= "\n";
}
-sub thread_skel {
- my ($skel, $ctx, $hdr, $tpfx) = @_;
+sub SKEL_EXPAND () {
+ qq(expand[<a\nhref="T/#u">flat</a>) .
+ qq(|<a\nhref="t/#u">nested</a>] ) .
+ qq(<a\nhref="t.mbox.gz">mbox.gz</a> ) .
+ qq(<a\nhref="t.atom">Atom feed</a>);
+}
+
+sub thread_skel ($$$) {
+ my ($skel, $ctx, $hdr) = @_;
my $mid = mids($hdr)->[0];
my $ibx = $ctx->{-inbox};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
- my $expand = qq(expand[<a\nhref="${tpfx}T/#u">flat</a>) .
- qq(|<a\nhref="${tpfx}t/#u">nested</a>] ) .
- qq(<a\nhref="${tpfx}t.mbox.gz">mbox.gz</a> ) .
- qq(<a\nhref="${tpfx}t.atom">Atom feed</a>);
-
my $parent = in_reply_to($hdr);
$$skel .= "\n<b>Thread overview: </b>";
if ($nr <= 1) {
if (defined $parent) {
- $$skel .= "$expand\n ";
- $$skel .= ghost_parent("$tpfx../", $parent) . "\n";
+ $$skel .= SKEL_EXPAND."\n ";
+ $$skel .= ghost_parent('../', $parent) . "\n";
} else {
- $$skel .= "[no followups] $expand\n";
+ $$skel .= '[no followups] '.SKEL_EXPAND."\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
return;
}
- $$skel .= "$nr+ messages / $expand";
- $$skel .= qq! <a\nhref="#b">top</a>\n!;
+ $$skel .= $nr;
+ $$skel .= '+ messages / '.SKEL_EXPAND.qq! <a\nhref="#b">top</a>\n!;
# nb: mutt only shows the first Subject in the index pane
# when multiple Subject: headers are present, so we follow suit:
@@ -806,7 +808,7 @@ sub html_footer {
my $rv = '<pre>';
if ($ibx->over) {
$skel .= "\n";
- thread_skel(\$skel, $ctx, $hdr, '');
+ thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
$next = $prev = ' ';
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 ` [PATCH 05/22] view: reduce parameters for html_footer Eric Wong
2020-01-25 4:44 ` Eric Wong [this message]
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-7-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.
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).