From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/5] wwwhighlight: deal with no-op highlight
Date: Wed, 24 Apr 2019 23:02:12 +0000 [thread overview]
Message-ID: <20190424230214.2378-4-e@80x24.org> (raw)
In-Reply-To: <20190424230214.2378-1-e@80x24.org>
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
next prev parent reply other threads:[~2019-04-24 23:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 23:02 [PATCH 0/5] cgit + WwwHighlight.pm integration Eric Wong
2019-04-24 23:02 ` [PATCH 1/5] wwwhighlight: do linkification, too Eric Wong
2019-04-24 23:02 ` [PATCH 2/5] examples/cgit-commit-filter: remove unused variable Eric Wong
2019-04-24 23:02 ` Eric Wong [this message]
2019-04-24 23:02 ` [PATCH 4/5] examples: cgit filter for use with WwwHighlight Eric Wong
2019-04-25 3:19 ` [PATCH v2] " Eric Wong
2019-04-25 3:25 ` Eric Wong
2019-04-24 23:02 ` [PATCH 5/5] examples/cgit-commit-filter.lua: some doc updates 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=20190424230214.2378-4-e@80x24.org \
--to=e@80x24.org \
--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.
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).