* [PATCH 00/22] HTML display cleanups, fixes, speedups
@ 2020-01-25 4:44 7% Eric Wong
2020-01-25 4:45 4% ` [PATCH 16/22] linkify: move to_html over from ViewDiff 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 7%]
* [PATCH 16/22] linkify: move to_html over from ViewDiff
2020-01-25 4:44 7% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
@ 2020-01-25 4:45 4% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-25 4:45 UTC (permalink / raw)
To: meta
We use the same idiom in many places for doing two-step
linkification and HTML escaping. Get rid of an outdated
comment in flush_quote while we're at it.
---
lib/PublicInbox/Linkify.pm | 2 ++
lib/PublicInbox/View.pm | 8 ++------
lib/PublicInbox/ViewDiff.pm | 31 +++++++++++++------------------
lib/PublicInbox/ViewVCS.pm | 6 ++----
lib/PublicInbox/WwwListing.pm | 3 +--
5 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 77b94f56..199457af 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -120,4 +120,6 @@ sub linkify_mids {
!ge;
}
+sub to_html { linkify_2($_[0], ascii_html(linkify_1(@_))) }
+
1;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 54a49de6..f613afb5 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -496,13 +496,10 @@ sub multipart_text_as_html {
sub flush_quote {
my ($s, $l, $quot) = @_;
- # show everything in the full version with anchor from
- # short version (see above)
- my $rv = $l->linkify_1($$quot);
+ my $rv = $l->to_html($$quot);
# we use a <span> here to allow users to specify their own
# color for quoted text
- $rv = $l->linkify_2(ascii_html($rv));
$$quot = undef;
$$s .= qq(<span\nclass="q">) . $rv . '</span>'
}
@@ -608,8 +605,7 @@ sub add_text_body { # callback for msg_iter
flush_diff($rv, $ctx, $l);
} else {
# regular lines, OK
- $l->linkify_1($cur);
- $$rv .= $l->linkify_2(ascii_html($cur));
+ $$rv .= $l->to_html($cur);
$cur = undef;
}
}
diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 10d71004..be0c0452 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -44,11 +44,6 @@ my $PATH_B = '"?b/.+|/dev/null';
# cf. git diff.c :: get_compact_summary
my $DIFFSTAT_COMMENT = qr/\((?:new|gone|(?:(?:new|mode) [\+\-][lx]))\)/;
-sub to_html ($$) {
- $_[0]->linkify_1($_[1]);
- $_[0]->linkify_2(ascii_html($_[1]));
-}
-
# link to line numbers in blobs
sub diff_hunk ($$$$) {
my ($dctx, $spfx, $ca, $cb) = @_;
@@ -107,7 +102,7 @@ sub anchor0 ($$$$$) {
my $spaces = ($orig =~ s/( +)\z//) ? $1 : '';
$$dst .= " <a\nid=i$attr\nhref=#$attr>" .
ascii_html($orig) . '</a>' . $spaces .
- to_html($linkify, $rest);
+ $linkify->to_html($rest);
return 1;
}
undef;
@@ -116,7 +111,7 @@ sub anchor0 ($$$$$) {
sub anchor1 ($$$$$) {
my ($dst, $ctx, $linkify, $pb, $s) = @_;
my $attr = to_attr($ctx->{-apfx}.$pb) or return;
- my $line = to_html($linkify, $s);
+ my $line = $linkify->to_html($s);
my $ok = delete $ctx->{-anchors}->{$attr};
@@ -158,7 +153,7 @@ sub flush_diff ($$$) {
} elsif ($state2class[$state]) {
to_state($dst, $state, DSTATE_CTX);
}
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ /^-- $/) { # email signature begins
$state == DSTATE_INIT or
to_state($dst, $state, DSTATE_INIT);
@@ -178,53 +173,53 @@ sub flush_diff ($$$) {
uri_escape_utf8($pa, UNSAFE);
}
anchor1($dst, $ctx, $linkify, $pb, $s) and next;
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ s/^(index $OID_NULL\.\.)($OID_BLOB)\b//o) {
$$dst .= $1 . oid($dctx, $spfx, $2);
$dctx = { Q => '' };
- $$dst .= to_html($linkify, $s) ;
+ $$dst .= $linkify->to_html($s) ;
} elsif ($s =~ s/^index ($OID_BLOB)(\.\.$OID_NULL)\b//o) {
$$dst .= 'index ' . oid($dctx, $spfx, $1) . $2;
$dctx = { Q => '' };
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ /^index ($OID_BLOB)\.\.($OID_BLOB)/o) {
$dctx->{oid_a} = $1;
$dctx->{oid_b} = $2;
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ s/^@@ (\S+) (\S+) @@//) {
$$dst .= '</span>' if $state2class[$state];
$$dst .= qq(<span\nclass="hunk">);
$$dst .= diff_hunk($dctx, $spfx, $1, $2);
$$dst .= '</span>';
$state = DSTATE_CTX;
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ m!^--- (?:$PATH_A)!o ||
$s =~ m!^\+{3} (?:$PATH_B)!o) {
# color only (no oid link) if missing dctx->{oid_*}
$state <= DSTATE_STAT and
to_state($dst, $state, DSTATE_HEAD);
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ /^\+/) {
if ($state != DSTATE_ADD && $state > DSTATE_STAT) {
to_state($dst, $state, DSTATE_ADD);
}
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} elsif ($s =~ /^-/) {
if ($state != DSTATE_DEL && $state > DSTATE_STAT) {
to_state($dst, $state, DSTATE_DEL);
}
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
# ignore the following lines in headers:
} elsif ($s =~ /^(?:dis)similarity index/ ||
$s =~ /^(?:old|new) mode/ ||
$s =~ /^(?:deleted|new) file mode/ ||
$s =~ /^(?:copy|rename) (?:from|to) / ||
$s =~ /^(?:dis)?similarity index /) {
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
} else {
$state <= DSTATE_STAT or
to_state($dst, $state, DSTATE_INIT);
- $$dst .= to_html($linkify, $s);
+ $$dst .= $linkify->to_html($s);
}
}
@$diff = ();
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index fdca70cb..77b3ca28 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -90,8 +90,7 @@ sub show_other_result ($$) {
}
my $l = PublicInbox::Linkify->new;
utf8::decode($$bref);
- $l->linkify_1($$bref);
- $$bref = '<pre>'. $l->linkify_2(ascii_html($$bref));
+ $$bref = '<pre>'. $l->to_html($$bref);
$$bref .= '</pre><hr>' . $$logref;
html_page($ctx, 200, $bref);
}
@@ -125,9 +124,8 @@ sub solve_result {
my $ref = ref($res);
my $l = PublicInbox::Linkify->new;
- $l->linkify_1($log);
$log = '<pre>debug log:</pre><hr /><pre>' .
- $l->linkify_2(ascii_html($log)) . '</pre>';
+ $l->to_html($log) . '</pre>';
$res or return html_page($ctx, 404, \$log);
$ref eq 'ARRAY' or return html_page($ctx, 500, \$log);
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 8d610037..37ffffc1 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -111,8 +111,7 @@ sub html ($$) {
my $tmp = join("\n", map { ibx_entry(@$_, $env) } @$list);
my $l = PublicInbox::Linkify->new;
- $l->linkify_1($tmp);
- $out = '<pre>'.$l->linkify_2(ascii_html($tmp)).'</pre><hr>';
+ $out = '<pre>'.$l->to_html($tmp).'</pre><hr>';
}
$out = "<html><head><title>$title</title></head><body>" . $out;
$out .= '<pre>'. PublicInbox::WwwStream::code_footer($env) .
^ permalink raw reply related [relevance 4%]
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 7% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
2020-01-25 4:45 4% ` [PATCH 16/22] linkify: move to_html over from ViewDiff 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).