From 95e5b6c343c45bb303db67fe7eb77e395c031e8d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 18 Apr 2020 03:38:48 +0000 Subject: 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. --- lib/PublicInbox/Inbox.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/PublicInbox') 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 { -- cgit v1.2.3-24-ge0c7