From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei up: fix canonicalization of Maildirs
Date: Sat, 17 Apr 2021 10:24:45 +0000 [thread overview]
Message-ID: <20210417102445.1541-1-e@80x24.org> (raw)
We always represent --output destination directories with a
trailing slash to disambiguate directories from mbox filenames.
Therefore, we must use the trailing slash when mapping the
destination beck from the lei/saved-search/* directory.
"lei up" now relies exclusively on the users --output pathname
or URL for updates. This ought to be less confusing since
pathnames in ~/.local/store/lei/saved-searches aren't ideal.
---
lib/PublicInbox/LeiSavedSearch.pm | 13 ++++++++-----
t/lei-q-save.t | 4 +++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm
index 932b2aa4..0f632d93 100644
--- a/lib/PublicInbox/LeiSavedSearch.pm
+++ b/lib/PublicInbox/LeiSavedSearch.pm
@@ -26,18 +26,21 @@ sub lss_dir_for ($$) {
} else { # basename
@n = ($$dstref =~ m{([\w\-\.]+)/*\z});
$$dstref = $lei->rel2abs($$dstref);
+ $$dstref .= '/' if -d $$dstref;
}
push @n, sha256_hex($$dstref);
$lei->share_path . '/saved-searches/' . join('-', @n);
}
sub new {
- my ($cls, $lei, $dir) = @_;
+ my ($cls, $lei, $dst) = @_;
my $self = bless { ale => $lei->ale }, $cls;
- if (defined $dir) { # updating existing saved search via "lei up"
- my $f = "$dir/lei.saved-search";
- ((-f $f && -r _) || output2lssdir($self, $lei, \$dir, \$f)) or
- return $lei->fail("$f non-existent or unreadable");
+ my $dir;
+ if (defined $dst) { # updating existing saved search via "lei up"
+ my $f;
+ $dir = $dst;
+ output2lssdir($self, $lei, \$dir, \$f) or
+ return $lei->fail("--save was not used with $dst");
$self->{-cfg} //= PublicInbox::Config::git_config_dump($f);
$self->{'-f'} = $f;
} else { # new saved search "lei q --save"
diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index d43f508b..6389825f 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -27,7 +27,9 @@ test_lei(sub {
# ensure "lei up" works, since it compliments "lei q --save"
$in = $doc2->as_string;
lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
- lei_ok qw(up -q), $s[0];
+ opendir my $dh, '.' or xbail "opendir .: $!";
+ lei_ok qw(up -q md -C), $home;
+ chdir($dh) or xbail "fchdir . $!";
my %after = map { $_ => 1 } glob("$home/md/cur/*");
is(delete $after{(keys(%before))[0]}, 1, 'original message kept');
is(scalar(keys %after), 1, 'one new message added');
next reply other threads:[~2021-04-17 10:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-17 10:24 Eric Wong [this message]
2021-04-17 19:00 ` [PATCH 2/] lei up: further improve Maildir canonicalization Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210417102445.1541-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).