inbox: don't memoize missing description|cloneurl

It's probably common to have inboxes initially setup without
these files properly configured, so don't memoize at that stage.

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 95ffd039fdb7390b359c66bd30be6080d280e7cc..e49f85fc0dbd78264b6ef2ecbf3365e766540b76 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -219,19 +219,22 @@ sub try_cat {
 
 sub description {
        my ($self) = @_;
-       $self->{description} //= do {
+       ($self->{description} //= do {
                my $desc = try_cat("$self->{inboxdir}/description");
                local $/ = "\n";
                chomp $desc;
                $desc =~ s/\s+/ /smg;
-               $desc eq '' ? '($INBOX_DIR/description missing)' : $desc;
-       };
+               $desc eq '' ? undef : $desc;
+       }) // '($INBOX_DIR/description missing)';
 }
 
 sub cloneurl {
        my ($self) = @_;
-       $self->{cloneurl} //=
-               [ split(/\s+/s, try_cat("$self->{inboxdir}/cloneurl")) ];
+       ($self->{cloneurl} //= do {
+               my $s = try_cat("$self->{inboxdir}/cloneurl");
+               my @urls = split(/\s+/s, $s);
+               scalar(@urls) ? \@urls : undef
+       }) // [];
 }
 
 sub base_url {

diff --git a/t/inbox.t b/t/inbox.t
index 5f86440d47f614ef89e3c0b978f2391a04d847b6..b59d5dba8c0fbd1c6000b06175f97d136a43ad3c 100644 (file)
--- a/t/inbox.t
+++ b/t/inbox.t
@@ -4,12 +4,31 @@ use strict;
 use warnings;
 use Test::More;
 use_ok 'PublicInbox::Inbox';
+use File::Temp 0.19 ();
 my $x = PublicInbox::Inbox->new({url => [ '//example.com/test/' ]});
 is($x->base_url, 'https://example.com/test/', 'expanded protocol-relative');
 $x = PublicInbox::Inbox->new({url => [ 'http://example.com/test' ]});
 is($x->base_url, 'http://example.com/test/', 'added trailing slash');
 
 $x = PublicInbox::Inbox->new({});
+
 is($x->base_url, undef, 'undef base_url allowed');
+my $tmpdir = File::Temp->newdir('pi-inbox-XXXXXX', TMPDIR => 1);
+$x->{inboxdir} = $tmpdir->dirname;
+is_deeply($x->cloneurl, [], 'no cloneurls');
+is($x->description, '($INBOX_DIR/description missing)', 'default description');
+{
+       open my $fh, '>', "$x->{inboxdir}/cloneurl" or die;
+       print $fh "https://example.com/inbox\n" or die;
+       close $fh or die;
+       open $fh, '>', "$x->{inboxdir}/description" or die;
+       print $fh "blah\n" or die;
+       close $fh or die;
+}
+is_deeply($x->cloneurl, ['https://example.com/inbox'], 'cloneurls update');
+is($x->description, 'blah', 'description updated');
+is(unlink(glob("$x->{inboxdir}/*")), 2, 'unlinked cloneurl & description');
+is_deeply($x->cloneurl, ['https://example.com/inbox'], 'cloneurls memoized');
+is($x->description, 'blah', 'description memoized');
 
 done_testing();