watch: move imap_common_init to NetReader

We'll use this in LeiImport and likely other places.

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index 79047fd24d78fcac188ef36b95a883bddf7a5277..8c919f6638b6a28c732b3784dc5fb7dccf740977 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -10,7 +10,9 @@ use parent qw(Exporter);
 # TODO: trim this down, this is huge
 our @EXPORT = qw(uri_new uri_scheme uri_section
                mic_for nn_new nn_for
-               imap_url nntp_url);
+               imap_url nntp_url
+               cfg_bool cfg_intvl imap_common_init
+               );
 
 # avoid exposing deprecated "snews" to users.
 my %SCHEME_MAP = ('snews' => 'nntps');
@@ -217,4 +219,65 @@ sub nntp_url {
        $url;
 }
 
+sub cfg_intvl ($$$) {
+       my ($cfg, $key, $url) = @_;
+       my $v = $cfg->urlmatch($key, $url) // return;
+       $v =~ /\A[0-9]+(?:\.[0-9]+)?\z/s and return $v + 0;
+       if (ref($v) eq 'ARRAY') {
+               $v = join(', ', @$v);
+               warn "W: $key has multiple values: $v\nW: $key ignored\n";
+       } else {
+               warn "W: $key=$v is not a numeric value in seconds\n";
+       }
+}
+
+sub cfg_bool ($$$) {
+       my ($cfg, $key, $url) = @_;
+       my $orig = $cfg->urlmatch($key, $url) // return;
+       my $bool = $cfg->git_bool($orig);
+       warn "W: $key=$orig for $url is not boolean\n" unless defined($bool);
+       $bool;
+}
+
+# flesh out common IMAP-specific data structures
+sub imap_common_init ($) {
+       my ($self) = @_;
+       eval { require PublicInbox::IMAPClient } or
+               die "Mail::IMAPClient is required for IMAP:\n$@\n";
+       eval { require PublicInbox::IMAPTracker } or
+               die "DBD::SQLite is required for IMAP\n:$@\n";
+       require PublicInbox::URIimap;
+       my $cfg = $self->{pi_cfg};
+       my $mic_args = {}; # scheme://authority => Mail:IMAPClient arg
+       for my $url (sort keys %{$self->{imap}}) {
+               my $uri = PublicInbox::URIimap->new($url);
+               my $sec = uri_section($uri);
+               for my $k (qw(Starttls Debug Compress)) {
+                       my $bool = cfg_bool($cfg, "imap.$k", $url) // next;
+                       $mic_args->{$sec}->{$k} = $bool;
+               }
+               my $to = cfg_intvl($cfg, 'imap.timeout', $url);
+               $mic_args->{$sec}->{Timeout} = $to if $to;
+               for my $k (qw(pollInterval idleInterval)) {
+                       $to = cfg_intvl($cfg, "imap.$k", $url) // next;
+                       $self->{imap_opt}->{$sec}->{$k} = $to;
+               }
+               my $k = 'imap.fetchBatchSize';
+               my $bs = $cfg->urlmatch($k, $url) // next;
+               if ($bs =~ /\A([0-9]+)\z/) {
+                       $self->{imap_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 $url (sort keys %{$self->{imap}}) {
+               my $uri = PublicInbox::URIimap->new($url);
+               $mics->{uri_section($uri)} //= mic_for($self, $url, $mic_args);
+       }
+       $mics;
+}
+
 1;

diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 8a457b815579543a8785ec2b31d33757a76797ed..6b6be44cb202be1a8d7e8eb3d0f1427aae540d16 100644 (file)
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -280,55 +280,6 @@ sub watch_fs_init ($) {
        PublicInbox::DirIdle->new([keys %{$self->{mdmap}}], $cb);
 }
 
-sub cfg_intvl ($$$) {
-       my ($cfg, $key, $url) = @_;
-       my $v = $cfg->urlmatch($key, $url) // return;
-       $v =~ /\A[0-9]+(?:\.[0-9]+)?\z/s and return $v + 0;
-       if (ref($v) eq 'ARRAY') {
-               $v = join(', ', @$v);
-               warn "W: $key has multiple values: $v\nW: $key ignored\n";
-       } else {
-               warn "W: $key=$v is not a numeric value in seconds\n";
-       }
-}
-
-sub cfg_bool ($$$) {
-       my ($cfg, $key, $url) = @_;
-       my $orig = $cfg->urlmatch($key, $url) // return;
-       my $bool = $cfg->git_bool($orig);
-       warn "W: $key=$orig for $url is not boolean\n" unless defined($bool);
-       $bool;
-}
-
-# flesh out common IMAP-specific data structures
-sub imap_common_init ($) {
-       my ($self) = @_;
-       my $cfg = $self->{pi_cfg};
-       my $mic_args = {}; # scheme://authority => Mail:IMAPClient arg
-       for my $url (sort keys %{$self->{imap}}) {
-               my $uri = PublicInbox::URIimap->new($url);
-               my $sec = uri_section($uri);
-               for my $k (qw(Starttls Debug Compress)) {
-                       my $bool = cfg_bool($cfg, "imap.$k", $url) // next;
-                       $mic_args->{$sec}->{$k} = $bool;
-               }
-               my $to = cfg_intvl($cfg, 'imap.timeout', $url);
-               $mic_args->{$sec}->{Timeout} = $to if $to;
-               for my $k (qw(pollInterval idleInterval)) {
-                       $to = cfg_intvl($cfg, "imap.$k", $url) // next;
-                       $self->{imap_opt}->{$sec}->{$k} = $to;
-               }
-               my $k = 'imap.fetchBatchSize';
-               my $bs = $cfg->urlmatch($k, $url) // next;
-               if ($bs =~ /\A([0-9]+)\z/) {
-                       $self->{imap_opt}->{$sec}->{batch_size} = $bs;
-               } else {
-                       warn "$k=$bs is not an integer\n";
-               }
-       }
-       $mic_args;
-}
-
 sub imap_import_msg ($$$$$) {
        my ($self, $url, $uid, $raw, $flags) = @_;
        # our target audience expects LF-only, save storage
@@ -667,21 +618,7 @@ sub poll_fetch_reap {
 
 sub watch_imap_init ($$) {
        my ($self, $poll) = @_;
-       eval { require PublicInbox::IMAPClient } or
-               die "Mail::IMAPClient is required for IMAP:\n$@\n";
-       eval { require PublicInbox::IMAPTracker } or
-               die "DBD::SQLite is required for IMAP\n:$@\n";
-
-       my $mic_args = imap_common_init($self); # read args from config
-
-       # 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 $url (sort keys %{$self->{imap}}) {
-               my $uri = PublicInbox::URIimap->new($url);
-               $mics->{uri_section($uri)} //= mic_for($self, $url, $mic_args);
-       }
-
+       my $mics = imap_common_init($self); # read args from config
        my $idle = []; # [ [ url1, intvl1 ], [url2, intvl2] ]
        for my $url (keys %{$self->{imap}}) {
                my $uri = PublicInbox::URIimap->new($url);