diff options
author | Eric Wong <e@yhbt.net> | 2020-04-18 03:38:48 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-04-19 08:51:21 +0000 |
commit | 95e5b6c343c45bb303db67fe7eb77e395c031e8d (patch) | |
tree | 1684f4a57a7c21df8530ea438a8ed9404e38ddd4 | |
parent | b15ca9a77bff088a3f5f0b8955de8b6a60565b04 (diff) | |
download | public-inbox-95e5b6c343c45bb303db67fe7eb77e395c031e8d.tar.gz |
It's probably common to have inboxes initially setup without these files properly configured, so don't memoize at that stage.
-rw-r--r-- | lib/PublicInbox/Inbox.pm | 13 | ||||
-rw-r--r-- | t/inbox.t | 19 |
2 files changed, 27 insertions, 5 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 95ffd039..e49f85fc 100644 --- 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 { @@ -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(); |