about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-04-17 19:00:53 +0000
committerEric Wong <e@80x24.org>2021-04-17 20:16:46 +0000
commit9c08efbbdb078f403feb1f9821fb13f12d868244 (patch)
treeda8da276adf55d91088a5792861c726a342c60d4
parent74cac24c6238c73279a82f18c7a6f11d387756bb (diff)
downloadpublic-inbox-9c08efbbdb078f403feb1f9821fb13f12d868244.tar.gz
We want to be able to use "lei up ." when inside a Maildir.
We'll also relax Maildir/mbox basenames to be any non-'/'
character after converting relative paths to absolute.  The
old restriction on allowed characters was unnecessary and made
it impossible to reliably map "." when used as the sole argument
for "lei up".
-rw-r--r--lib/PublicInbox/LeiSavedSearch.pm6
-rw-r--r--t/lei-q-save.t4
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm
index 0f632d93..e44779ee 100644
--- a/lib/PublicInbox/LeiSavedSearch.pm
+++ b/lib/PublicInbox/LeiSavedSearch.pm
@@ -24,9 +24,10 @@ sub lss_dir_for ($$) {
                 $$dstref = $$uri;
                 @n = ($uri->mailbox);
         } else { # basename
-                @n = ($$dstref =~ m{([\w\-\.]+)/*\z});
                 $$dstref = $lei->rel2abs($$dstref);
                 $$dstref .= '/' if -d $$dstref;
+                $$dstref =~ tr!/!/!s;
+                @n = ($$dstref =~ m{([^/]+)/*\z});
         }
         push @n, sha256_hex($$dstref);
         $lei->share_path . '/saved-searches/' . join('-', @n);
@@ -40,7 +41,8 @@ sub new {
                 my $f;
                 $dir = $dst;
                 output2lssdir($self, $lei, \$dir, \$f) or
-                        return $lei->fail("--save was not used with $dst");
+                        return $lei->fail("--save was not used with $dst cwd=".
+                                                $lei->rel2abs('.'));
                 $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 6389825f..a8eda41e 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -29,6 +29,8 @@ test_lei(sub {
         lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
         opendir my $dh, '.' or xbail "opendir .: $!";
         lei_ok qw(up -q md -C), $home;
+        lei_ok qw(up -q . -C), "$home/md";
+        lei_ok qw(up -q), "/$home/md";
         chdir($dh) or xbail "fchdir . $!";
         my %after = map { $_ => 1 } glob("$home/md/cur/*");
         is(delete $after{(keys(%before))[0]}, 1, 'original message kept');
@@ -51,5 +53,7 @@ test_lei(sub {
         lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
         lei_ok([qw(up mbcl2)], undef, { -C => $home, %$lei_opt });
         ok(-s "$home/mbcl2" > $size, 'size increased after up');
+
+        ok(!lei(qw(up -q), $home), 'up fails w/o --save');
 });
 done_testing;