* [PATCH 2/5] lei blob: support retrieving attachments via $OID:$IDX
2021-04-27 11:07 6% [PATCH 0/5] lei lcat - local cat (not lolcat :P) Eric Wong
@ 2021-04-27 11:07 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-04-27 11:07 UTC (permalink / raw)
To: meta
We'll be supporting some sort of text view for pager or
piping to an $EDITOR buffer.
---
lib/PublicInbox/LeiBlob.pm | 32 ++++++++++++++++++++++++++++++--
t/lei-import-imap.t | 6 ++++++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm
index e4cd4cca..4e52c8a5 100644
--- a/lib/PublicInbox/LeiBlob.pm
+++ b/lib/PublicInbox/LeiBlob.pm
@@ -84,12 +84,25 @@ sub do_solve_blob { # via wq_do
$solver->solve($lei->{env}, $log, $self->{oid_b}, $hints);
}
+sub cat_attach_i { # Eml->each_part callback
+ my ($part, $depth, $idx) = @{$_[0]};
+ my $lei = $_[1];
+ my $want = $lei->{-attach_idx} // return;
+ return if $idx ne $want; # [0-9]+(?:\.[0-9]+)+
+ delete $lei->{-attach_idx};
+ $lei->out($part->body);
+}
+
sub lei_blob {
my ($lei, $blob) = @_;
$lei->start_pager if -t $lei->{1};
my $opt = $lei->{opt};
my $has_hints = grep(defined, @$opt{qw(oid-a path-a path-b)});
my $lxs;
+ if ($blob =~ s/:([0-9\.]+)\z//) {
+ $lei->{-attach_idx} = $1;
+ $opt->{mail} = 1;
+ }
# first, see if it's a blob returned by "lei q" JSON output:k
if ($opt->{mail} // ($has_hints ? 0 : 1)) {
@@ -97,7 +110,7 @@ sub lei_blob {
$lxs = $lei->lxs_prepare;
$lei->ale->refresh_externals($lxs);
}
- my $rdr = { 1 => $lei->{1} };
+ my $rdr = {};
if ($opt->{mail}) {
$rdr->{2} = $lei->{2};
} else {
@@ -105,7 +118,22 @@ sub lei_blob {
}
my $cmd = [ 'git', '--git-dir='.$lei->ale->git->{git_dir},
'cat-file', 'blob', $blob ];
- waitpid(spawn($cmd, $lei->{env}, $rdr), 0);
+ if (defined $lei->{-attach_idx}) {
+ my $fh = popen_rd($cmd, $lei->{env}, $rdr);
+ require PublicInbox::Eml;
+ my $str = do { local $/; <$fh> };
+ if (close $fh) {
+ my $eml = PublicInbox::Eml->new(\$str);
+ $eml->each_part(\&cat_attach_i, $lei, 1);
+ my $idx = delete $lei->{-attach_idx};
+ defined($idx) and return $lei->fail(<<EOM);
+E: attachment $idx not found in $blob
+EOM
+ }
+ } else {
+ $rdr->{1} = $lei->{1};
+ waitpid(spawn($cmd, $lei->{env}, $rdr), 0);
+ }
return if $? == 0;
return $lei->child_error($?) if $opt->{mail};
}
diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t
index 376a8b48..cf1fa49d 100644
--- a/t/lei-import-imap.t
+++ b/t/lei-import-imap.t
@@ -52,5 +52,11 @@ test_lei({ tmpdir => $tmpdir }, sub {
is(ref($x->{'lei/store'}), 'ARRAY', 'lei/store in inspect');
is(ref($x->{sync}), 'HASH', 'sync in inspect');
is(ref($x->{sync}->{$k[0]}), 'ARRAY', 'UID arrays in inspect');
+
+ my $psgi_attach = 'cfa3622cbeffc9bd6b0fc66c4d60d420ba74f60d';
+ lei_ok('blob', $psgi_attach);
+ like($lei_out, qr!^Content-Type: multipart/mixed;!sm, 'got full blob');
+ lei_ok('blob', "$psgi_attach:2");
+ is($lei_out, "b64\xde\xad\xbe\xef\n", 'got attachment');
});
done_testing;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] lei lcat - local cat (not lolcat :P)
@ 2021-04-27 11:07 6% Eric Wong
2021-04-27 11:07 7% ` [PATCH 2/5] lei blob: support retrieving attachments via $OID:$IDX Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-04-27 11:07 UTC (permalink / raw)
To: meta
"lei lcat" is a convenience command to extract Message-IDs
from URLs and <$MSGID> or "id:$MSGID" args (or stdin) and
attempt to display them as text.
--format=text is now the default for lcat, and an option for
"lei q" for stdout users. It decodes base64 and QP just like
the WWW interface. It also supports ANSI terminal colors and
loads the diff ones from the users' existing git config.
It's actually my first time using Term::ANSIColor, even though
it's bundled with Perl since 5.6.
I got sidetracked on the sync stuff, but "ls-sync" exists, now.
I'm not sure how sync would work, especially since I want to
avoid reconnecting for imports...
Eric Wong (5):
lei: add "ls-sync" command for listing sync folders
lei blob: support retrieving attachments via $OID:$IDX
lei: standardize on _lei_wq_eof callback for workers
lei lcat: extract Message-IDs from URLs and show them
lei q + lcat: support --format=text output
MANIFEST | 5 +
lib/PublicInbox/Hval.pm | 2 +-
lib/PublicInbox/LEI.pm | 12 +-
lib/PublicInbox/LeiBlob.pm | 37 ++++-
lib/PublicInbox/LeiConvert.pm | 2 +-
lib/PublicInbox/LeiExternal.pm | 2 +-
lib/PublicInbox/LeiImport.pm | 6 +-
lib/PublicInbox/LeiLcat.pm | 125 +++++++++++++++++
lib/PublicInbox/LeiLsSync.pm | 29 ++++
lib/PublicInbox/LeiMirror.pm | 6 +-
lib/PublicInbox/LeiP2q.pm | 2 +-
lib/PublicInbox/LeiTag.pm | 8 +-
lib/PublicInbox/LeiToMail.pm | 63 ++++++++-
lib/PublicInbox/LeiViewText.pm | 237 +++++++++++++++++++++++++++++++++
lib/PublicInbox/ViewDiff.pm | 4 +-
t/lei-import-imap.t | 8 ++
t/lei-import-maildir.t | 3 +
t/lei-lcat.t | 16 +++
t/lei_lcat.t | 44 ++++++
19 files changed, 584 insertions(+), 27 deletions(-)
create mode 100644 lib/PublicInbox/LeiLcat.pm
create mode 100644 lib/PublicInbox/LeiLsSync.pm
create mode 100644 lib/PublicInbox/LeiViewText.pm
create mode 100644 t/lei-lcat.t
create mode 100644 t/lei_lcat.t
^ 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 --
2021-04-27 11:07 6% [PATCH 0/5] lei lcat - local cat (not lolcat :P) Eric Wong
2021-04-27 11:07 7% ` [PATCH 2/5] lei blob: support retrieving attachments via $OID:$IDX 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).