* [PATCH 3/5] wwwhighlight: deal with no-op highlight
2019-04-24 23:02 6% [PATCH 0/5] cgit + WwwHighlight.pm integration Eric Wong
@ 2019-04-24 23:02 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-04-24 23:02 UTC (permalink / raw)
To: meta
Not all inputs are highlight-able, so reuse the original
input and just linkify it if it can't be highlighted.
---
lib/PublicInbox/WwwHighlight.pm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/WwwHighlight.pm b/lib/PublicInbox/WwwHighlight.pm
index d8101b7..bc349f8 100644
--- a/lib/PublicInbox/WwwHighlight.pm
+++ b/lib/PublicInbox/WwwHighlight.pm
@@ -25,6 +25,7 @@ use bytes (); # only for bytes::length
use HTTP::Status qw(status_message);
use parent qw(PublicInbox::HlMod);
use PublicInbox::Linkify qw();
+use PublicInbox::Hval qw(ascii_html);
# TODO: support highlight(1) for distros which don't package the
# SWIG extension. Also, there may be admins who don't want to
@@ -67,7 +68,11 @@ sub call {
my $bref = read_in_full($env) or return r(500);
my $l = PublicInbox::Linkify->new;
$l->linkify_1($$bref);
- $bref = $self->do_hl($bref, $env->{PATH_INFO});
+ if (my $res = $self->do_hl($bref, $env->{PATH_INFO})) {
+ $bref = $res;
+ } else {
+ $$bref = ascii_html($$bref);
+ }
$l->linkify_2($$bref);
my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] cgit + WwwHighlight.pm integration
@ 2019-04-24 23:02 6% Eric Wong
2019-04-24 23:02 7% ` [PATCH 3/5] wwwhighlight: deal with no-op highlight Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-04-24 23:02 UTC (permalink / raw)
To: meta
cgit-wwwhighlight-filter.lua can benefit cgit installations by
allowing them to avoid spawning a new process for about-filter
and source-filter in cgitrc.
Instead of spawning highlight(1) or similar every time a cgit
filter is invoked, we can have a long-lived PSGI server running
WwwHighlight.pm(*) and rely on lua-http to access the server
over loopback.
WwwHighlight.pm is also updated to support the same
linkification logic we use for emails.
(*) see examples/highlight.psgi
Eric Wong (5):
wwwhighlight: do linkification, too
examples/cgit-commit-filter: remove unused variable
wwwhighlight: deal with no-op highlight
examples: cgit filter for use with WwwHighlight
examples/cgit-commit-filter.lua: some doc updates
MANIFEST | 1 +
examples/cgit-commit-filter.lua | 10 ++++-
examples/cgit-wwwhighlight-filter.lua | 57 +++++++++++++++++++++++++++
lib/PublicInbox/WwwHighlight.pm | 11 +++++-
4 files changed, 77 insertions(+), 2 deletions(-)
create mode 100644 examples/cgit-wwwhighlight-filter.lua
^ 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 --
2019-04-24 23:02 6% [PATCH 0/5] cgit + WwwHighlight.pm integration Eric Wong
2019-04-24 23:02 7% ` [PATCH 3/5] wwwhighlight: deal with no-op highlight 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).