diff options
| author | Eric Wong <e@80x24.org> | 2021-09-03 08:54:27 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-09-03 08:57:36 +0000 |
| commit | 42420897bd81bf5664d5a93c5069dda4cb0459f1 (patch) | |
| tree | ee1146f0d7e4d8b530989ff2d0f871355b7508b2 | |
| parent | a3ad598c92039fae4a78354be9c33fff5328d7db (diff) | |
| download | public-inbox-42420897bd81bf5664d5a93c5069dda4cb0459f1.tar.gz | |
xt/net_writer-imap.t was completely broken in recent months and I completely forgot this test. net->add_url still only accepts bare scalars (and not scalar refs), so we must set that up properly. Furthermore, our changes to do FLAGS-only synchronization in lei of old messages was causing us to not handle FLAGS properly for the test.
| -rw-r--r-- | lib/PublicInbox/LeiToMail.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/NetReader.pm | 5 | ||||
| -rw-r--r-- | lib/PublicInbox/NetWriter.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/Watch.pm | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index be6e178f..6e102a1d 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -406,7 +406,7 @@ sub new { my $net = PublicInbox::NetWriter->new; $net->{quiet} = $lei->{opt}->{quiet}; my $uri = PublicInbox::URIimap->new($dst)->canonical; - $net->add_url($uri); + $net->add_url($$uri); my $err = $net->errors($lei); return $lei->fail($err) if $err; $uri->mailbox or return $lei->fail("No mailbox: $dst"); diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 23445e7a..c050c60f 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -493,6 +493,9 @@ sub perm_fl_ok ($) { undef; } +# may be overridden in NetWriter or Watch +sub folder_select { $_[0]->{each_old} ? 'select' : 'examine' } + sub _imap_fetch_all ($$$) { my ($self, $mic, $orig_uri) = @_; my $sec = uri_section($orig_uri); @@ -501,7 +504,7 @@ sub _imap_fetch_all ($$$) { # we need to check for mailbox writability to see if we care about # FLAGS from already-imported messages. - my $cmd = $self->{each_old} ? 'select' : 'examine'; + my $cmd = $self->folder_select; $mic->$cmd($mbx) or return "E: \U$cmd\E $mbx ($sec) failed: $!"; my ($r_uidval, $r_uidnext, $perm_fl); diff --git a/lib/PublicInbox/NetWriter.pm b/lib/PublicInbox/NetWriter.pm index 82288e6b..629a752a 100644 --- a/lib/PublicInbox/NetWriter.pm +++ b/lib/PublicInbox/NetWriter.pm @@ -26,6 +26,8 @@ sub imap_append { die "APPEND $folder: $@"; } +sub folder_select { 'select' } # for PublicInbox::NetReader + sub imap_delete_all { my ($self, $uri) = @_; my $mic = $self->mic_for_folder($uri) or return; diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm index 86dae91f..482d35c4 100644 --- a/lib/PublicInbox/Watch.pm +++ b/lib/PublicInbox/Watch.pm @@ -682,4 +682,6 @@ EOF undef; } +sub folder_select { 'select' } # for PublicInbox::NetReader + 1; |