From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 799DA1FA01 for ; Wed, 24 Feb 2021 11:31:55 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/4] net_reader: trim exports and remove unused uri_new Date: Wed, 24 Feb 2021 17:31:54 +0600 Message-Id: <20210224113154.686-5-e@80x24.org> In-Reply-To: <20210224113154.686-1-e@80x24.org> References: <20210224113154.686-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: More network things for -watch are isolated in NetReader, now, so fewer exports are necessary. --- lib/PublicInbox/NetReader.pm | 15 +-------------- lib/PublicInbox/Watch.pm | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index f3988f15..462514ed 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -10,11 +10,7 @@ use PublicInbox::Eml; our %IMAPflags2kw = map {; "\\\u$_" => $_ } qw(seen answered flagged draft); -# TODO: trim this down, this is huge -our @EXPORT = qw(uri_new uri_section - nn_new imap_uri nntp_uri - cfg_bool cfg_intvl imap_common_init nntp_common_init - ); +our @EXPORT = qw(uri_section imap_uri nntp_uri); # returns the git config section name, e.g [imap "imaps://user@example.com"] # without the mailbox, so we can share connections between different inboxes @@ -94,15 +90,6 @@ sub mic_for { # mic = Mail::IMAPClient $mic; } -sub uri_new { - my ($url) = @_; - require URI; - - # URI::snews exists, URI::nntps does not, so use URI::snews - $url =~ s!\Anntps://!snews://!i; - URI->new($url); -} - # Net::NNTP doesn't support CAPABILITIES, yet sub try_starttls ($) { my ($host) = @_; diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm index 0b72bd16..dd245935 100644 --- a/lib/PublicInbox/Watch.pm +++ b/lib/PublicInbox/Watch.pm @@ -544,7 +544,7 @@ sub poll_fetch_reap { sub watch_imap_init ($$) { my ($self, $poll) = @_; - my $mics = imap_common_init($self); # read args from config + my $mics = PublicInbox::NetReader::imap_common_init($self); my $idle = []; # [ [ uri1, intvl1 ], [uri2, intvl2] ] for my $uri (@{$self->{imap_order}}) { my $sec = uri_section($uri); @@ -565,7 +565,7 @@ sub watch_imap_init ($$) { sub watch_nntp_init ($$) { my ($self, $poll) = @_; - nntp_common_init($self); # read args from config + PublicInbox::NetReader::nntp_common_init($self); for my $uri (@{$self->{nntp_order}}) { my $sec = uri_section($uri); my $intvl = $self->{nntp_opt}->{$sec}->{pollInterval};