From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 7/8] net_reader: improve naming of common args
Date: Thu, 9 Sep 2021 05:25:04 +0000 [thread overview]
Message-ID: <20210909052505.7174-8-e@80x24.org> (raw)
In-Reply-To: <20210909052505.7174-1-e@80x24.org>
IMHO this makes things easier-to-follow than before.
---
lib/PublicInbox/NetReader.pm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index 91e53913..181741f6 100644
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -58,7 +58,7 @@ sub auth_anon_cb { '' }; # for Mail::IMAPClient::Authcallback
# mic_for may prompt the user and store auth info, prepares mic_get
sub mic_for ($$$$) { # mic = Mail::IMAPClient
- my ($self, $uri, $mic_args, $lei) = @_;
+ my ($self, $uri, $mic_common, $lei) = @_;
require PublicInbox::GitCredential;
my $cred = bless {
url => "$uri",
@@ -68,7 +68,7 @@ sub mic_for ($$$$) { # mic = Mail::IMAPClient
password => $uri->password,
}, 'PublicInbox::GitCredential';
my $sec = uri_section($uri);
- my $common = $mic_args->{$sec} // {};
+ my $common = $mic_common->{$sec} // {};
# IMAPClient and Net::Netrc both mishandles `0', so we pass `127.0.0.1'
my $host = $cred->{host};
$host = '127.0.0.1' if $host eq '0';
@@ -174,7 +174,7 @@ E: <$uri> STARTTLS requested and failed
}
sub nn_for ($$$$) { # nn = Net::NNTP
- my ($self, $uri, $nn_args, $lei) = @_;
+ my ($self, $uri, $nn_common, $lei) = @_;
my $sec = uri_section($uri);
my $nntp_cfg = $self->{cfg_opt}->{$sec} //= {};
my $host = $uri->host;
@@ -193,7 +193,7 @@ sub nn_for ($$$$) { # nn = Net::NNTP
($cred->{username}, $cred->{password}) = ($u, $p);
$p //= $cred->check_netrc;
}
- my $common = $nn_args->{$sec} // {};
+ my $common = $nn_common->{$sec} // {};
my $nn_arg = {
Port => $uri->port,
Host => $host,
@@ -282,15 +282,15 @@ sub imap_common_init ($;$) {
die "DBD::SQLite is required for IMAP\n:$@\n";
require PublicInbox::URIimap;
my $cfg = $self->{pi_cfg} // $lei->_lei_cfg;
- my $mic_args = {}; # scheme://authority => Mail:IMAPClient arg
+ my $mic_common = {}; # scheme://authority => Mail:IMAPClient arg
for my $uri (@{$self->{imap_order}}) {
my $sec = uri_section($uri);
for my $k (qw(Starttls Debug Compress)) {
my $bool = cfg_bool($cfg, "imap.$k", $$uri) // next;
- $mic_args->{$sec}->{$k} = $bool;
+ $mic_common->{$sec}->{$k} = $bool;
}
my $to = cfg_intvl($cfg, 'imap.timeout', $$uri);
- $mic_args->{$sec}->{Timeout} = $to if $to;
+ $mic_common->{$sec}->{Timeout} = $to if $to;
my $sa = socks_args($cfg->urlmatch('imap.Proxy', $$uri));
$self->{cfg_opt}->{$sec}->{-proxy_cfg} = $sa if $sa;
for my $k (qw(pollInterval idleInterval)) {
@@ -311,7 +311,7 @@ sub imap_common_init ($;$) {
my $sec = uri_section($orig_uri);
my $uri = PublicInbox::URIimap->new("$sec/");
my $mic = $mics->{$sec} //=
- mic_for($self, $uri, $mic_args, $lei) //
+ mic_for($self, $uri, $mic_common, $lei) //
die "Unable to continue\n";
next unless $self->isa('PublicInbox::NetWriter');
my $dst = $orig_uri->mailbox // next;
@@ -331,10 +331,10 @@ sub nntp_common_init ($;$) {
($lei || eval { require PublicInbox::IMAPTracker }) or
die "DBD::SQLite is required for NNTP\n:$@\n";
my $cfg = $self->{pi_cfg} // $lei->_lei_cfg;
- my $nn_args = {}; # scheme://authority => Net::NNTP->new arg
+ my $nn_common = {}; # scheme://authority => Net::NNTP->new arg
for my $uri (@{$self->{nntp_order}}) {
my $sec = uri_section($uri);
- my $args = $nn_args->{$sec} //= {};
+ my $args = $nn_common->{$sec} //= {};
# Debug and Timeout are passed to Net::NNTP->new
my $v = cfg_bool($cfg, 'nntp.Debug', $$uri);
@@ -360,7 +360,7 @@ sub nntp_common_init ($;$) {
my %nn; # schema://authority => Net::NNTP object
for my $uri (@{$self->{nntp_order}}) {
my $sec = uri_section($uri);
- $nn{$sec} //= nn_for($self, $uri, $nn_args, $lei);
+ $nn{$sec} //= nn_for($self, $uri, $nn_common, $lei);
}
\%nn; # for optional {nn_cached}
}
next prev parent reply other threads:[~2021-09-09 5:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 5:24 [PATCH 0/8] net_reader: simplify + fix bugs Eric Wong
2021-09-09 5:24 ` [PATCH 1/8] net_reader: do not set "SSL" fields for non-TLS Eric Wong
2021-09-09 5:24 ` [PATCH 2/8] net_reader: set IMAPClient Keepalive flag late Eric Wong
2021-09-09 5:25 ` [PATCH 3/8] net_reader: preserve memoized IMAPClient arg for SOCKS Eric Wong
2021-09-09 5:25 ` [PATCH 4/8] net_reader: nntp_opt => cfg_opt Eric Wong
2021-09-09 5:25 ` [PATCH 5/8] net_reader: imap_opt " Eric Wong
2021-09-09 5:25 ` [PATCH 6/8] net_reader: combine Net::NNTP and IMAPClient args Eric Wong
2021-09-09 5:25 ` Eric Wong [this message]
2021-09-09 5:25 ` [PATCH 8/8] net_reader: support Mail::IMAPClient Ignoresizeerrors Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210909052505.7174-8-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).