* [PATCH 09/11] lei_view_text: improve attachment display
2021-04-28 7:51 7% [PATCH 00/11] lei: misc fixes, more lcat color support Eric Wong
@ 2021-04-28 7:52 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-04-28 7:52 UTC (permalink / raw)
To: meta
Support setting a color to distinguish from user-supplied text.
We'll also put the $BLOB:$IDX identifier on a separate line and
just put the entire corresponding lei command in the form of:
"[-- lei blob $BLOB:$IDX --]" to teach users how to access it.
---
lib/PublicInbox/LeiViewText.pm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/LeiViewText.pm b/lib/PublicInbox/LeiViewText.pm
index 6f5fca49..5d649840 100644
--- a/lib/PublicInbox/LeiViewText.pm
+++ b/lib/PublicInbox/LeiViewText.pm
@@ -25,6 +25,7 @@ my %DEFAULT_COLOR = (
quoted => 'blue',
hdrdefault => 'cyan',
status => 'bright_cyan', # smsg stuff
+ attachment => 'bright_red',
# git names and defaults, falls back to ~/.gitconfig
new => 'green',
@@ -113,20 +114,21 @@ sub hdr_buf ($$) {
sub attach_note ($$$$;$) {
my ($self, $ct, $p, $fn, $err) = @_;
my ($part, $depth, $idx) = @$p;
- my $obuf = $self->{obuf};
my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
- $$obuf .= <<EOF if $err;
+ my $abuf = $err ? <<EOF : '';
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
EOF
- my $blob = $self->{-smsg}->{blob} // '';
- $blob .= ':' if $blob ne '';
- $$obuf .= "[-- Attachment $blob$idx ";
+ $abuf .= "[-- Attachment #$idx: ";
_xs($ct);
my $size = length($part->body);
my $ts = "Type: $ct, Size: $size bytes";
my $d = $part->header('Content-Description') // $fn // '';
_xs($d);
- $$obuf .= $d eq '' ? "$ts --]\n" : "$d --]\n[-- $ts --]\n";
+ $abuf .= $d eq '' ? "$ts --]\n" : "$d --]\n[-- $ts --]\n";
+ if (my $blob = $self->{-smsg}->{blob}) {
+ $abuf .= "[-- lei blob $blob:$idx --]\n";
+ }
+ $self->{-colored}->($self, 'attachment', $abuf);
hdr_buf($self, $part) if $part->{is_submsg};
}
^ permalink raw reply related [relevance 6%]
* [PATCH 00/11] lei: misc fixes, more lcat color support
@ 2021-04-28 7:51 7% Eric Wong
2021-04-28 7:52 6% ` [PATCH 09/11] lei_view_text: improve attachment display Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-04-28 7:51 UTC (permalink / raw)
To: meta
I'm seeing some odd test failures in "make check-run"
(but not "make check") that I haven't diagnosed, yet.
So there's some diagnostic changes and some golfing
to make internals more consistent.
Eric Wong (11):
t/lei-p2q: add diagnostics
tests: restore CWD with "lei -C" and run_script
view_diff: minor coding style fixes
lei_p2q: add _lei_wq_eof callback
lei-daemon: note FD count mismatch to client
t/run.perl: add (GNU) tail and strace support
lei: quiet down Eml-related warnings consistently
lei: simple WQ workers use {wq1} field
lei_view_text: improve attachment display
lei_view_text: translate background colors from git
lei (lcat|q): support --no-color and --color
lib/PublicInbox/LEI.pm | 30 ++++++++++++++++++++---------
lib/PublicInbox/LeiBlob.pm | 9 +--------
lib/PublicInbox/LeiConvert.pm | 3 +--
lib/PublicInbox/LeiImport.pm | 10 +++-------
lib/PublicInbox/LeiLsSearch.pm | 2 +-
lib/PublicInbox/LeiMirror.pm | 4 ++--
lib/PublicInbox/LeiP2q.pm | 6 ++----
lib/PublicInbox/LeiStore.pm | 1 -
lib/PublicInbox/LeiTag.pm | 9 ++-------
lib/PublicInbox/LeiViewText.pm | 35 +++++++++++++++++++++++-----------
lib/PublicInbox/LeiXSearch.pm | 1 -
lib/PublicInbox/TestCommon.pm | 12 ++++++++----
lib/PublicInbox/ViewDiff.pm | 9 ++++-----
script/lei | 4 ++--
t/lei-externals.t | 5 -----
t/lei-p2q.t | 4 ++--
t/lei-q-save.t | 4 ----
t/run.perl | 7 +++++++
t/solver_git.t | 5 -----
19 files changed, 80 insertions(+), 80 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-04-28 7:51 7% [PATCH 00/11] lei: misc fixes, more lcat color support Eric Wong
2021-04-28 7:52 6% ` [PATCH 09/11] lei_view_text: improve attachment display 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).