net_reader: combine Net::NNTP and IMAPClient args

[public-inbox.git] / lib / PublicInbox / NetReader.pm

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index e0a642020bab458e84bad7fdbfd27522134a532a..91e53913240ee9478c00bbe350a2eaece84366e0 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -43,7 +43,7 @@ EOM
 sub mic_new ($$$$) {
        my ($self, $mic_arg, $sec, $uri) = @_;
        my %mic_arg = %$mic_arg;
-       my $sa = $self->{imap_opt}->{$sec}->{-proxy_cfg} || $self->{-proxy_cli};
+       my $sa = $self->{cfg_opt}->{$sec}->{-proxy_cfg} || $self->{-proxy_cli};
        if ($sa) {
                my %opt = %$sa;
                $opt{ConnectAddr} = delete $mic_arg{Server};
@@ -108,7 +108,7 @@ sub mic_for ($$$$) { # mic = Mail::IMAPClient
        my $err;
        if ($mic->login && $mic->IsAuthenticated) {
                # success! keep IMAPClient->new arg in case we get disconnected
-               $self->{mic_arg}->{$sec} = $mic_arg;
+               $self->{net_arg}->{$sec} = $mic_arg;
                if ($cred) {
                        $uri->user($cred->{username}) if !defined($uri->user);
                } elsif ($mic_arg->{Authmechanism} eq 'ANONYMOUS') {
@@ -230,7 +230,7 @@ W: see https://rt.cpan.org/Ticket/Display.html?id=129967 for updates
                }
        }
 
-       $self->{nn_arg}->{$sec} = $nn_arg;
+       $self->{net_arg}->{$sec} = $nn_arg;
        $cred->run($nn ? 'approve' : 'reject') if $cred && $cred->{filled};
        $nn;
 }
@@ -292,21 +292,20 @@ sub imap_common_init ($;$) {
                my $to = cfg_intvl($cfg, 'imap.timeout', $$uri);
                $mic_args->{$sec}->{Timeout} = $to if $to;
                my $sa = socks_args($cfg->urlmatch('imap.Proxy', $$uri));
-               $self->{imap_opt}->{$sec}->{-proxy_cfg} = $sa if $sa;
+               $self->{cfg_opt}->{$sec}->{-proxy_cfg} = $sa if $sa;
                for my $k (qw(pollInterval idleInterval)) {
                        $to = cfg_intvl($cfg, "imap.$k", $$uri) // next;
-                       $self->{imap_opt}->{$sec}->{$k} = $to;
+                       $self->{cfg_opt}->{$sec}->{$k} = $to;
                }
                my $k = 'imap.fetchBatchSize';
                my $bs = $cfg->urlmatch($k, $$uri) // next;
                if ($bs =~ /\A([0-9]+)\z/) {
-                       $self->{imap_opt}->{$sec}->{batch_size} = $bs;
+                       $self->{cfg_opt}->{$sec}->{batch_size} = $bs;
                } else {
                        warn "$k=$bs is not an integer\n";
                }
        }
        # make sure we can connect and cache the credentials in memory
-       $self->{mic_arg} = {}; # schema://authority => IMAPClient->new args
        my $mics = {}; # schema://authority => IMAPClient obj
        for my $orig_uri (@{$self->{imap_order}}) {
                my $sec = uri_section($orig_uri);
@@ -358,7 +357,6 @@ sub nntp_common_init ($;$) {
                }
        }
        # make sure we can connect and cache the credentials in memory
-       $self->{nn_arg} = {}; # schema://authority => Net::NNTP->new args
        my %nn; # schema://authority => Net::NNTP object
        for my $uri (@{$self->{nntp_order}}) {
                my $sec = uri_section($uri);
@@ -462,7 +460,7 @@ sub each_old_flags ($$$$) {
        my ($self, $mic, $uri, $l_uid) = @_;
        $l_uid ||= 1;
        my $sec = uri_section($uri);
-       my $bs = ($self->{imap_opt}->{$sec}->{batch_size} // 1) * 10000;
+       my $bs = ($self->{cfg_opt}->{$sec}->{batch_size} // 1) * 10000;
        my ($eml_cb, @args) = @{$self->{eml_each}};
        $self->{quiet} or warn "# $uri syncing flags 1:$l_uid\n";
        for (my $n = 1; $n <= $l_uid; $n += $bs) {
@@ -554,7 +552,7 @@ EOF
                my $m = $mod ? " [(UID % $mod) == $shard]" : '';
                warn "# $uri fetching UID $l_uid:$r_uid$m\n";
        }
-       my $bs = $self->{imap_opt}->{$sec}->{batch_size} // 1;
+       my $bs = $self->{cfg_opt}->{$sec}->{batch_size} // 1;
        my $req = $mic->imap4rev1 ? 'BODY.PEEK[]' : 'RFC822.PEEK';
        my $key = $req;
        $key =~ s/\.PEEK//;
@@ -622,7 +620,7 @@ sub mic_get {
                return $mic if $mic && $mic->IsConnected;
                delete $cached->{$sec};
        }
-       my $mic_arg = $self->{mic_arg}->{$sec} or
+       my $mic_arg = $self->{net_arg}->{$sec} or
                        die "BUG: no Mail::IMAPClient->new arg for $sec";
        if (defined(my $cb_name = $mic_arg->{Authcallback})) {
                if (ref($cb_name) ne 'CODE') {
@@ -660,7 +658,7 @@ sub nn_get {
        my $cached = $self->{nn_cached} // {};
        my $nn;
        $nn = delete($cached->{$sec}) and return $nn;
-       my $nn_arg = $self->{nn_arg}->{$sec} or
+       my $nn_arg = $self->{net_arg}->{$sec} or
                        die "BUG: no Net::NNTP->new arg for $sec";
        my $nntp_cfg = $self->{cfg_opt}->{$sec};
        $nn = nn_new($nn_arg, $nntp_cfg, $uri) or return;