* [PATCH 1/3] lei_input: avoid special case sub for --stdin
2021-03-29 7:08 6% [PATCH 0/3] lei input improvements Eric Wong
@ 2021-03-29 7:08 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-03-29 7:08 UTC (permalink / raw)
To: meta
We can consistently open /dev/stdin correctly nowadays, so
drop the input_stdin and just use the normal ->path_to_fd
code path.
---
lib/PublicInbox/LeiConvert.pm | 1 -
lib/PublicInbox/LeiImport.pm | 1 -
lib/PublicInbox/LeiInput.pm | 8 +-------
lib/PublicInbox/LeiMark.pm | 1 -
4 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 5d0adb14..da3b50cc 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -34,7 +34,6 @@ sub input_maildir_cb {
sub do_convert { # via wq_do
my ($self) = @_;
- $self->input_stdin;
for my $input (@{$self->{inputs}}) {
$self->input_path_url($input);
}
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 803b5cda..227a2a21 100644
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -78,7 +78,6 @@ sub lei_import { # the main "lei import" method
$self->{-wq_nr_workers} = $j // 1; # locked
my ($op_c, undef) = $lei->workers_start($self, 'lei_import', $j, $ops);
$lei->{imp} = $self;
- $self->wq_io_do('input_stdin', []) if $self->{0};
net_merge_complete($self) unless $lei->{auth};
$op_c->op_wait_event($ops);
}
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index d916249a..93284e8b 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -46,12 +46,6 @@ error reading $name: $!
}
}
-sub input_stdin {
- my ($self) = @_;
- my $in = delete $self->{0} or return;
- $self->input_fh($self->{lei}->{opt}->{'in-format'}, $in, '<stdin>');
-}
-
sub input_path_url {
my ($self, $input, @args) = @_;
my $lei = $self->{lei};
@@ -94,7 +88,7 @@ sub prepare_inputs { # returns undef on error
@$inputs and return
$lei->fail("--stdin and @$inputs do not mix");
check_input_format($lei) or return;
- $self->{0} = $lei->{0};
+ push @$inputs, '/dev/stdin';
}
my $net = $lei->{net}; # NetWriter may be created by l2m
my $fmt = $lei->{opt}->{'in-format'};
diff --git a/lib/PublicInbox/LeiMark.pm b/lib/PublicInbox/LeiMark.pm
index 6e611318..b187d6e7 100644
--- a/lib/PublicInbox/LeiMark.pm
+++ b/lib/PublicInbox/LeiMark.pm
@@ -118,7 +118,6 @@ sub lei_mark { # the "lei mark" method
$self->{vmd_mod} = $vmd_mod;
my ($op_c, undef) = $lei->workers_start($self, 'lei_mark', 1, $ops);
$lei->{mark} = $self;
- $self->wq_io_do('input_stdin', []) if $self->{0};
net_merge_complete($self) unless $lei->{auth};
$op_c->op_wait_event($ops);
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] lei input improvements
@ 2021-03-29 7:08 6% Eric Wong
2021-03-29 7:08 7% ` [PATCH 1/3] lei_input: avoid special case sub for --stdin Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-03-29 7:08 UTC (permalink / raw)
To: meta
These affect the convert, import, mark sub-commands.
Eric Wong (3):
lei_input: avoid special case sub for --stdin
lei: use IO::Uncompress::Gunzip MultiStream
lei_input: treat ".eml" and ".patch" suffix as "eml"
lib/PublicInbox/LeiConvert.pm | 1 -
lib/PublicInbox/LeiImport.pm | 1 -
lib/PublicInbox/LeiInput.pm | 33 +++++++++++++++++++--------------
lib/PublicInbox/LeiMark.pm | 1 -
lib/PublicInbox/LeiRemote.pm | 2 +-
lib/PublicInbox/LeiXSearch.pm | 2 +-
t/lei-import.t | 2 +-
t/lei-mark.t | 4 ++--
8 files changed, 24 insertions(+), 22 deletions(-)
^ 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-03-29 7:08 6% [PATCH 0/3] lei input improvements Eric Wong
2021-03-29 7:08 7% ` [PATCH 1/3] lei_input: avoid special case sub for --stdin 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).