* [PATCH 8/8] lei: fix read/write IMAP access
2021-09-03 8:54 6% [PATCH 0/8] lei: fix IMAP R/W; L/kw false positives Eric Wong
@ 2021-09-03 8:54 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-09-03 8:54 UTC (permalink / raw)
To: meta
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.
---
lib/PublicInbox/LeiToMail.pm | 2 +-
lib/PublicInbox/NetReader.pm | 5 ++++-
lib/PublicInbox/NetWriter.pm | 2 ++
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;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/8] lei: fix IMAP R/W; L/kw false positives
@ 2021-09-03 8:54 6% Eric Wong
2021-09-03 8:54 7% ` [PATCH 8/8] lei: fix read/write IMAP access Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-09-03 8:54 UTC (permalink / raw)
To: meta
Back to using syslog more for errors, since it's still less
instrusive. IMAP R/W is fixed (ugh, lack of automatic tests
since we only have a read-only IMAP server for testing).
Some error/warning fixes, and false-positives on L: and kw:
searches on local (but not remote) externals are avoided.
"lei inspect --stdin" was somewhat useful for figuring out why
L: was false-positiving an external result on me.
Eric Wong (8):
lei: dump errors to syslog, and not to CLI
lei/store: quiet down link(2) warnings
lei: ->child_error less error-prone
lei: use lei->lms in place of lse->lms in a few places
lei up --all: avoid double-close on shared STDOUT
lei inspect: support reading eml from --stdin
lei_xsearch: avoid false-positives on externals w/ L: and kw:
lei: fix read/write IMAP access
MANIFEST | 1 +
lib/PublicInbox/LEI.pm | 27 ++++++++++--------
lib/PublicInbox/LeiBlob.pm | 2 +-
lib/PublicInbox/LeiIndex.pm | 2 +-
lib/PublicInbox/LeiInput.pm | 4 +--
lib/PublicInbox/LeiInspect.pm | 43 ++++++++++++++++++++++++-----
lib/PublicInbox/LeiLcat.pm | 2 +-
lib/PublicInbox/LeiPruneMailSync.pm | 26 ++++++++---------
lib/PublicInbox/LeiRediff.pm | 2 +-
lib/PublicInbox/LeiStore.pm | 10 ++-----
lib/PublicInbox/LeiStoreErr.pm | 4 +--
lib/PublicInbox/LeiToMail.pm | 2 +-
lib/PublicInbox/LeiUp.pm | 6 +++-
lib/PublicInbox/LeiXSearch.pm | 1 +
lib/PublicInbox/NetReader.pm | 5 +++-
lib/PublicInbox/NetWriter.pm | 2 ++
lib/PublicInbox/Watch.pm | 2 ++
t/lei-daemon.t | 5 ----
t/lei-up.t | 39 ++++++++++++++++++++++++++
19 files changed, 130 insertions(+), 55 deletions(-)
create mode 100644 t/lei-up.t
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-09-03 8:54 6% [PATCH 0/8] lei: fix IMAP R/W; L/kw false positives Eric Wong
2021-09-03 8:54 7% ` [PATCH 8/8] lei: fix read/write IMAP access Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).