user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
* [PATCH] lei: simplify lazy-loading
@ 2021-03-21 11:24 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-03-21 11:24 UTC (permalink / raw)
  To: meta

This makes it slightly easier to implement future commands,
since there'll be a couple more relatively self-contained
ones.
---
 lib/PublicInbox/LEI.pm        | 22 ++++++----------------
 lib/PublicInbox/LeiConvert.pm |  6 +++---
 lib/PublicInbox/LeiImport.pm  |  6 +++---
 lib/PublicInbox/LeiP2q.pm     |  6 +++---
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index bf97a680..b6d21af6 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -598,7 +598,12 @@ sub dispatch {
 	}
 	my $func = "lei_$cmd";
 	$func =~ tr/-/_/;
-	if (my $cb = __PACKAGE__->can($func)) {
+	my $cb = __PACKAGE__->can($func) // ($CMD{$cmd} ? do {
+		my $mod = "PublicInbox::Lei\u$cmd";
+		($INC{"PublicInbox/Lei\u$cmd.pm"} //
+			eval("require $mod")) ? $mod->can($func) : undef;
+	} : undef);
+	if ($cb) {
 		optparse($self, $cmd, \@argv) or return;
 		if (my $chdir = $self->{opt}->{C}) {
 			for my $d (@$chdir) {
@@ -685,21 +690,6 @@ sub lei_config {
 	x_it($self, $?) if $?;
 }
 
-sub lei_import {
-	require PublicInbox::LeiImport;
-	PublicInbox::LeiImport->call(@_);
-}
-
-sub lei_convert {
-	require PublicInbox::LeiConvert;
-	PublicInbox::LeiConvert->call(@_);
-}
-
-sub lei_p2q {
-	require PublicInbox::LeiP2q;
-	PublicInbox::LeiP2q->call(@_);
-}
-
 sub lei_init {
 	my ($self, $dir) = @_;
 	my $cfg = _lei_cfg($self, 1);
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index fcc67f0b..8d3b221a 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -77,11 +77,11 @@ sub do_convert { # via wq_do
 	delete $self->{wcb}; # commit
 }
 
-sub call { # the main "lei convert" method
-	my ($cls, $lei, @inputs) = @_;
+sub lei_convert { # the main "lei convert" method
+	my ($lei, @inputs) = @_;
 	my $opt = $lei->{opt};
 	$opt->{kw} //= 1;
-	my $self = $lei->{cnv} = bless {}, $cls;
+	my $self = $lei->{cnv} = bless {}, __PACKAGE__;
 	my $in_fmt = $opt->{'in-format'};
 	my (@f, @d);
 	$opt->{dedupe} //= 'none';
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index ae24a1fa..0e2a96e8 100644
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -63,13 +63,13 @@ sub import_start {
 	while ($op && $op->{sock}) { $op->event_step }
 }
 
-sub call { # the main "lei import" method
-	my ($cls, $lei, @inputs) = @_;
+sub lei_import { # the main "lei import" method
+	my ($lei, @inputs) = @_;
 	my $sto = $lei->_lei_store(1);
 	$sto->write_prepare($lei);
 	my ($net, @f, @d);
 	$lei->{opt}->{kw} //= 1;
-	my $self = $lei->{imp} = bless { inputs => \@inputs }, $cls;
+	my $self = $lei->{imp} = bless { inputs => \@inputs }, __PACKAGE__;
 	if ($lei->{opt}->{stdin}) {
 		@inputs and return $lei->fail("--stdin and @inputs do not mix");
 		$lei->check_input_format or return;
diff --git a/lib/PublicInbox/LeiP2q.pm b/lib/PublicInbox/LeiP2q.pm
index c5718603..302d7864 100644
--- a/lib/PublicInbox/LeiP2q.pm
+++ b/lib/PublicInbox/LeiP2q.pm
@@ -174,9 +174,9 @@ sub do_p2q { # via wq_do
 	$lei->out(@q, "\n");
 }
 
-sub call { # the "lei patch-to-query" entry point
-	my ($cls, $lei, $input) = @_;
-	my $self = $lei->{p2q} = bless {}, $cls;
+sub lei_p2q { # the "lei patch-to-query" entry point
+	my ($lei, $input) = @_;
+	my $self = $lei->{p2q} = bless {}, __PACKAGE__;
 	if ($lei->{opt}->{stdin}) {
 		$self->{0} = delete $lei->{0}; # guard from lei_atfork_child
 	} else {

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-03-21 11:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-21 11:24 [PATCH] lei: simplify lazy-loading Eric Wong

user/dev discussion of public-inbox itself

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 meta meta/ http://public-inbox.org/meta \
		meta@public-inbox.org
	public-inbox-index meta

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git