about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-02-19 05:09:54 -0700
committerEric Wong <e@80x24.org>2021-02-19 19:25:25 +0000
commitbf367c9ac999e2e64a53ead083f68b171d9f6d35 (patch)
tree9f8f00f65c737b5c2a9bc5040f4b4c7e2f260a72 /lib
parent74e31aec6f66f695850bacf6379a034ea49a1d28 (diff)
downloadpublic-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')
-rw-r--r--lib/PublicInbox/NetReader.pm42
-rw-r--r--lib/PublicInbox/NetWriter.pm26
2 files changed, 52 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;
 }
 
diff --git a/lib/PublicInbox/NetWriter.pm b/lib/PublicInbox/NetWriter.pm
new file mode 100644
index 00000000..6f0a0b94
--- /dev/null
+++ b/lib/PublicInbox/NetWriter.pm
@@ -0,0 +1,26 @@
+# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# common writer code for IMAP (and later, JMAP)
+package PublicInbox::NetWriter;
+use strict;
+use v5.10.1;
+use parent qw(PublicInbox::NetReader);
+use PublicInbox::Smsg;
+use PublicInbox::MsgTime qw(msg_timestamp);
+
+my %IMAPkw2flags;
+@IMAPkw2flags{values %PublicInbox::NetReader::IMAPflags2kw} =
+                                keys %PublicInbox::NetReader::IMAPflags2kw;
+
+sub imap_append {
+        my ($mic, $folder, $bref, $smsg, $eml) = @_;
+        $bref //= \($eml->as_string);
+        $smsg //= bless { }, 'PublicInbox::Smsg';
+        $smsg->{ts} //= msg_timestamp($eml // PublicInbox::Eml->new($$bref));
+        my @f = map { $IMAPkw2flags{$_} } @{$smsg->{kw}};
+        $mic->append_string($folder, $$bref, "@f", $smsg->internaldate) or
+                die "APPEND $folder: $@";
+}
+
+1;