* [PATCH] lei_view_text: remove all CR before LF
@ 2022-05-02 9:04 6% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-05-02 9:04 UTC (permalink / raw)
To: meta
This deals with CR-CR-LF messages, matching the HTML change in
7ee3643af9b72cad (view: remove all CR before LF, 2022-02-11)
---
lib/PublicInbox/LeiViewText.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LeiViewText.pm b/lib/PublicInbox/LeiViewText.pm
index 2dad3b78..53555467 100644
--- a/lib/PublicInbox/LeiViewText.pm
+++ b/lib/PublicInbox/LeiViewText.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# PublicInbox::Eml to (optionally colorized) text coverter for terminals
@@ -243,7 +243,7 @@ sub add_text_buf { # callback for Eml->each_part
my ($s, $err) = msg_part_text($part, $ct);
return attach_note($self, $ct, $p, $fn) unless defined $s;
hdr_buf($self, $part) if $part->{is_submsg};
- $s =~ s/\r\n/\n/sg;
+ $s =~ s/\r+\n/\n/sg;
_xs($s);
my $diff = ($s =~ /^--- [^\n]+\n\+{3} [^\n]+\n@@ /ms);
my @sections = PublicInbox::MsgIter::split_quotes($s);
^ permalink raw reply related [relevance 6%]
* [PATCH] view: remove all CR before LF
@ 2022-02-11 20:22 14% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-02-11 20:22 UTC (permalink / raw)
To: Thomas Weißschuh; +Cc: meta
Thomas Weißschuh <thomas@t-8ch.de> wrote:
> Hi,
>
> it seems the rendering of \r\n (Windows-style) linebreaks, is a bit suboptimal
> on the website.
>
> The \r are rendered literally. Mutt for example does not.
>
> Example: https://lore.kernel.org/lkml/20210914093515.260031-1-maxime@cerno.tech/
Thanks for the example.
> Raw message:
> ...
> Content-Type: text/plain; charset="utf-8"
> Content-Transfer-Encoding: quoted-printable
> ...
>
>
> Hi,=0D
> =0D
> ....
>
> Rendered:
>
> ....
> Hi,\r
> \r
> ...
>
>
> The fix is probably obvious for you, if not I can try to come up with one.
Yes, except I remember adding support for CR-LF long ago...
The problem here is some messages are CR-CR-LF for some odd reason.
Oh well, it's a 1 character fix on our end for the HTML.
Not sure if ContentHash (deduplication) and SolverGit (blob
regeneration) ought to strip redundant CR, yet...
-------8<-------
Subject: [PATCH] view: remove all CR before LF
While we've rendered CR-LF as LF-only in HTML for many years,
some messages end up as CR-CR-LF. So strip ALL all CR bytes
preceding LF bytes, while preserving odd CR in the middle of
lines.
Reported-by: Thomas Weißschuh <thomas@t-8ch.de>
Link: https://public-inbox.org/meta/8d13668f-cac7-4984-bb4e-ad90502dc46d@t-8ch.de/
---
lib/PublicInbox/View.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 2e9cf705..ca02ae05 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -586,7 +586,7 @@ sub add_text_body { # callback for each_part
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
- $s =~ s/\r\n/\n/sg;
+ $s =~ s/\r+\n/\n/sg;
# will be escaped to `•' in HTML
obfuscate_addrs($ibx, $s, "\x{2022}") if $ibx->{obfuscate};
^ permalink raw reply related [relevance 14%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-01-14 20:48 Windows-style linebreaks (\r\n) and the web-renderer Thomas Weißschuh
2022-02-11 20:22 14% ` [PATCH] view: remove all CR before LF Eric Wong
2022-05-02 9:04 6% [PATCH] lei_view_text: " 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).