diff options
author | Eric Wong <e@80x24.org> | 2021-02-19 05:09:54 -0700 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-02-19 19:25:25 +0000 |
commit | bf367c9ac999e2e64a53ead083f68b171d9f6d35 (patch) | |
tree | 9f8f00f65c737b5c2a9bc5040f4b4c7e2f260a72 /lib/PublicInbox/NetReader.pm | |
parent | 74e31aec6f66f695850bacf6379a034ea49a1d28 (diff) | |
download | public-inbox-bf367c9ac999e2e64a53ead083f68b171d9f6d35.tar.gz |
Requiring TEST_IMAP_WRITE_URL to be set to a writable IMAP server URL isn't ideal, but it works for now until we have time to setup a mock dovecot/cyrus/etc... instance for testing.
Diffstat (limited to 'lib/PublicInbox/NetReader.pm')
-rw-r--r-- | lib/PublicInbox/NetReader.pm | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 22ba4be7..92d004bc 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -8,6 +8,8 @@ use v5.10.1; use parent qw(Exporter PublicInbox::IPC); 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_scheme uri_section mic_for nn_new nn_for @@ -33,6 +35,7 @@ sub uri_section ($) { 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, $url, $mic_args, $lei) = @_; require PublicInbox::URIimap; @@ -286,7 +289,12 @@ sub imap_common_init ($;$) { for my $url (@{$self->{imap_order}}) { my $uri = PublicInbox::URIimap->new($url); my $sec = uri_section($uri); - $mics->{$sec} //= mic_for($self, $url, $mic_args, $lei); + $mics->{$sec} //= mic_for($self, "$sec/", $mic_args, $lei); + next unless $self->isa('PublicInbox::NetWriter'); + my $dst = $uri->mailbox // next; + my $mic = $mics->{$sec}; + next if $mic->exists($dst); # already exists + $mic->create($dst) or die "CREATE $dst failed <$url>: $@"; } $mics; } @@ -312,13 +320,6 @@ sub errors { undef; } -my %IMAPflags2kw = ( - '\Seen' => 'seen', - '\Answered' => 'answered', - '\Flagged' => 'flagged', - '\Draft' => 'draft', -); - sub _imap_do_msg ($$$$$) { my ($self, $url, $uid, $raw, $flags) = @_; # our target audience expects LF-only, save storage @@ -418,25 +419,34 @@ sub _imap_fetch_all ($$$) { $err; } +# uses cached auth info prepared by mic_for +sub mic_get { + my ($self, $sec) = @_; + my $mic_arg = $self->{mic_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') { + $mic_arg->{Authcallback} = $self->can($cb_name); + } + } + my $mic = PublicInbox::IMAPClient->new(%$mic_arg); + $mic && $mic->IsConnected ? $mic : undef; +} + sub imap_each { my ($self, $url, $eml_cb, @args) = @_; my $uri = PublicInbox::URIimap->new($url); my $sec = uri_section($uri); - my $mic_arg = $self->{mic_arg}->{$sec} or - die "BUG: no Mail::IMAPClient->new arg for $sec"; local $0 = $uri->mailbox." $sec"; - my $cb_name = $mic_arg->{Authcallback}; - if (ref($cb_name) ne 'CODE') { - $mic_arg->{Authcallback} = $self->can($cb_name); - } - my $mic = PublicInbox::IMAPClient->new(%$mic_arg, Debug => 0); + my $mic = mic_get($self, $sec); my $err; - if ($mic && $mic->IsConnected) { + if ($mic) { local $self->{eml_each} = [ $eml_cb, @args ]; $err = _imap_fetch_all($self, $mic, $url); } else { $err = "E: not connected: $!"; } + warn $err if $err; $mic; } |