about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-28 10:45:24 +0000
committerEric Wong <e@80x24.org>2019-10-30 08:48:19 +0000
commit6c559dae69e244895fd7e6c5a9ae29f58d03058e (patch)
treefa363befdf4663a7034a422a3881e282a1abc295
parent1d9317540bc3fea86dcd512bb54275324ed1b0fa (diff)
downloadpublic-inbox-6c559dae69e244895fd7e6c5a9ae29f58d03058e.tar.gz
And use it for mda, since "0" could be a usable directory
if somebody insists on using relative paths...
-rw-r--r--lib/PublicInbox/InboxWritable.pm9
-rw-r--r--lib/PublicInbox/V2Writable.pm5
-rwxr-xr-xscript/public-inbox-mda4
-rw-r--r--t/import.t8
-rw-r--r--t/v2writable.t12
5 files changed, 33 insertions, 5 deletions
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index ab7b0ed5..9eab394d 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -30,12 +30,19 @@ sub new {
         $self;
 }
 
+sub assert_usable_dir {
+        my ($self) = @_;
+        my $dir = $self->{inboxdir};
+        return $dir if defined($dir) && $dir ne '';
+        die "no inboxdir defined for $self->{name}\n";
+}
+
 sub init_inbox {
         my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
         # TODO: honor skip_artnum
         my $v = $self->{version} || 1;
         if ($v == 1) {
-                my $dir = $self->{inboxdir} or die "no inboxdir in inbox\n";
+                my $dir = assert_usable_dir($self);
                 PublicInbox::Import::init_bare($dir);
         } else {
                 my $v2w = importer($self);
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index ad2e8e62..1825da2c 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -77,7 +77,8 @@ sub new {
         # $creat may be any true value, or 0/undef.  A hashref is true,
         # and $creat->{nproc} may be set to an integer
         my ($class, $v2ibx, $creat) = @_;
-        my $dir = $v2ibx->{inboxdir} or die "no inboxdir in inbox\n";
+        $v2ibx = PublicInbox::InboxWritable->new($v2ibx);
+        my $dir = $v2ibx->assert_usable_dir;
         unless (-d $dir) {
                 if ($creat) {
                         require File::Path;
@@ -86,8 +87,6 @@ sub new {
                         die "$dir does not exist\n";
                 }
         }
-
-        $v2ibx = PublicInbox::InboxWritable->new($v2ibx);
         $v2ibx->umask_prepare;
 
         my $xpfx = "$dir/xap" . PublicInbox::Search::SCHEMA_VERSION;
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 69354616..c122984f 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -49,8 +49,10 @@ if (!defined $dst) {
         }
         defined $dst or do_exit(67); # EX_NOUSER 5.1.1 user unknown
 }
-$dst->{inboxdir} or do_exit(67);
+
 $dst = PublicInbox::InboxWritable->new($dst);
+eval { $dst->assert_usable_dir };
+do_exit(67) if $@;
 
 # pre-check, MDA has stricter rules than an importer might;
 if ($precheck && !PublicInbox::MDA->precheck($simple, $dst->{address})) {
diff --git a/t/import.t b/t/import.t
index 4ec3c4f3..d309eec5 100644
--- a/t/import.t
+++ b/t/import.t
@@ -96,4 +96,12 @@ is(undef, $im->checkpoint, 'checkpoint works before ->done');
 $im->done;
 is(undef, $im->checkpoint, 'checkpoint works after ->done');
 $im->checkpoint;
+
+my $nogit = PublicInbox::Git->new("$dir/non-existent/dir");
+eval {
+        my $nope = PublicInbox::Import->new($nogit, 'nope', 'no@example.com');
+        $nope->add($mime);
+};
+ok($@, 'Import->add fails on non-existent dir');
+
 done_testing();
diff --git a/t/v2writable.t b/t/v2writable.t
index c2daac2f..06dafe98 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -260,4 +260,16 @@ EOF
         $im->done;
 }
 
+my $tmp = {
+        inboxdir => "$inboxdir/non-existent/subdir",
+        name => 'nope',
+        version => 2,
+        -primary_address => 'test@example.com',
+};
+eval {
+        my $nope = PublicInbox::V2Writable->new($tmp);
+        $nope->add($mime);
+};
+ok($@, 'V2Writable fails on non-existent dir');
+
 done_testing();