* [PATCH 14/22] view: inline and eliminate msg_html
2020-01-25 4:44 6% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
@ 2020-01-25 4:45 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-25 4:45 UTC (permalink / raw)
To: meta
No need to keep the old sub around, anymore. Rename auxiliary
subs to "msg_page_*" instead of the "html" version.
---
lib/PublicInbox/View.pm | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 9f340132..54a49de6 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -24,7 +24,7 @@ use constant INDENT => ' ';
use constant TCHILD => '` ';
sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
-sub msg_html_i {
+sub msg_page_i {
my ($nr, $ctx) = @_;
my $more = $ctx->{more};
if ($nr == 1) {
@@ -35,7 +35,7 @@ sub msg_html_i {
} elsif ($more) {
++$ctx->{end_nr};
# fake an EOF if {more} retrieval fails fails;
- eval { msg_html_more($ctx, $nr) };
+ eval { msg_page_more($ctx, $nr) };
} elsif ($nr == $ctx->{end_nr}) {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
@@ -48,18 +48,6 @@ sub msg_html_i {
# public functions: (unstable)
-sub msg_html {
- my ($ctx, $mime, $smsg) = @_;
- my $ibx = $ctx->{-inbox};
- $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- my $hdr = $ctx->{hdr} = $mime->header_obj;
- _msg_html_prepare_obuf($hdr, $ctx, 0);
- $ctx->{end_nr} = 2;
- $ctx->{smsg} = $smsg;
- $ctx->{mime} = $mime;
- PublicInbox::WwwStream->response($ctx, 200, \&msg_html_i);
-}
-
sub msg_page {
my ($ctx) = @_;
my $mid = $ctx->{mid};
@@ -78,10 +66,16 @@ sub msg_page {
} else {
$first = $ibx->msg_by_mid($mid) or return;
}
- msg_html($ctx, PublicInbox::MIME->new($first), $smsg);
+ my $mime = $ctx->{mime} = PublicInbox::MIME->new($first);
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ my $hdr = $ctx->{hdr} = $mime->header_obj;
+ _msg_page_prepare_obuf($hdr, $ctx, 0);
+ $ctx->{end_nr} = 2;
+ $ctx->{smsg} = $smsg;
+ PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
}
-sub msg_html_more {
+sub msg_page_more {
my ($ctx, $nr) = @_;
my ($id, $prev, $smsg) = @{$ctx->{more}};
my $ibx = $ctx->{-inbox};
@@ -91,7 +85,7 @@ sub msg_html_more {
return '' unless $smsg;
my $upfx = '../' . mid_escape($smsg->mid) . '/';
my $mime = delete $smsg->{mime};
- _msg_html_prepare_obuf($mime->header_obj, $ctx, $nr);
+ _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
multipart_text_as_html($mime, $upfx, $ctx);
${delete $ctx->{obuf}} .= '</pre><hr>';
}
@@ -623,7 +617,7 @@ sub add_text_body { # callback for msg_iter
obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
}
-sub _msg_html_prepare_obuf {
+sub _msg_page_prepare_obuf {
my ($hdr, $ctx, $nr) = @_;
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
^ 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:45 7% ` [PATCH 14/22] view: inline and eliminate msg_html 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:45 7% ` [PATCH 14/22] view: inline and eliminate msg_html 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).