* [PATCH 05/22] view: reduce parameters for html_footer
2020-01-25 4:44 6% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
@ 2020-01-25 4:44 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-25 4:44 UTC (permalink / raw)
To: meta
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 {
^ permalink raw reply related [relevance 7%]
* [PATCH 00/22] HTML display cleanups, fixes, speedups
@ 2020-01-25 4:44 6% Eric Wong
2020-01-25 4:44 7% ` [PATCH 05/22] view: reduce parameters for html_footer Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-25 4:44 UTC (permalink / raw)
To: meta
There's a lot more to do, but there's a couple of fixes for diff
viewing and href generation for solver. ViewDiff.pm is
significantly easier-to-read and follow <span> tags for.
Eric Wong (22):
www*stream: favor \&close instead of *close
www: use "skel" terminology consistently
view: improve readability around walk_thread
searchview: keep $noop sub private to the package
view: reduce parameters for html_footer
view: thread_skel: drop constant tpfx parameter
view: simplify duplicate Message-ID handling
wwwstream: discard single-use $ctx fields after use
view: start performing buffering into {obuf}
t/plack.t: modernize and unindent
init: use Import::run_die instead of system()
tests: move the majority of t/view.t into t/plack.t
xt/perf-msgview: switch to multipart_text_as_html
view: inline and eliminate msg_html
linkify: compile $LINK_RE once
linkify: move to_html over from ViewDiff
searchidx: skip filenames on "diff --git ..."
searchidx: don't assume "a/" and "b/" as prefixes
viewdiff: add "b=" param with non-standard diff prefix
viewdiff: add "b=" param when missing "diff --git" line
viewdiff: use autovivification for long_path hash
viewdiff: rewrite and simplify
lib/PublicInbox/Linkify.pm | 4 +-
lib/PublicInbox/SearchIdx.pm | 12 +-
lib/PublicInbox/SearchView.pm | 14 +-
lib/PublicInbox/View.pm | 214 +++++++--------
lib/PublicInbox/ViewDiff.pm | 283 ++++++++++---------
lib/PublicInbox/ViewVCS.pm | 10 +-
lib/PublicInbox/WwwAtomStream.pm | 10 +-
lib/PublicInbox/WwwListing.pm | 3 +-
lib/PublicInbox/WwwStream.pm | 21 +-
script/public-inbox-init | 10 +-
t/mid.t | 8 +-
t/plack.t | 456 ++++++++++++++++++-------------
t/view.t | 207 ++------------
xt/perf-msgview.t | 10 +-
xt/solver.t | 2 +-
15 files changed, 564 insertions(+), 700 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-25 4:44 6% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
2020-01-25 4:44 7% ` [PATCH 05/22] view: reduce parameters for html_footer Eric Wong
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).