From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 3/5] inbox: simplify ->description and ->cloneurl
Date: Tue, 4 Feb 2020 04:44:23 +0000 [thread overview]
Message-ID: <20200204044425.14031-4-e@yhbt.net> (raw)
In-Reply-To: <20200204044425.14031-1-e@yhbt.net>
We can use "//=" from Perl 5.10 to simplify the logic for these
methods. The use of chomp() in ->cloneurl was also unnecessary
since split(/\s+/s,...) already removes newlines.
---
lib/PublicInbox/Inbox.pm | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index b76d4e5a..accfd974 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -219,25 +219,19 @@ sub try_cat {
sub description {
my ($self) = @_;
- my $desc = $self->{description};
- return $desc if defined $desc;
- $desc = try_cat("$self->{inboxdir}/description");
- local $/ = "\n";
- chomp $desc;
- $desc =~ s/\s+/ /smg;
- $desc = '($INBOX_DIR/description missing)' if $desc eq '';
- $self->{description} = $desc;
+ $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;
+ };
}
sub cloneurl {
my ($self) = @_;
- my $url = $self->{cloneurl};
- return $url if $url;
- $url = try_cat("$self->{inboxdir}/cloneurl");
- my @url = split(/\s+/s, $url);
- local $/ = "\n";
- chomp @url;
- $self->{cloneurl} = \@url;
+ $self->{cloneurl} //=
+ [ split(/\s+/s, try_cat("$self->{inboxdir}/cloneurl")) ];
}
sub base_url {
next prev parent reply other threads:[~2020-02-04 4:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 4:44 [PATCH 0/5] a few more minor fixups Eric Wong
2020-02-04 4:44 ` [PATCH 1/5] www: stricter regexp for 405 errors Eric Wong
2020-02-04 4:44 ` [PATCH 2/5] www: serve $INBOX_DIR/description as $INBOX_URL/description Eric Wong
2020-02-04 4:44 ` Eric Wong [this message]
2020-02-04 4:44 ` [PATCH 4/5] inbox: remove TODO item for msg_by_path Eric Wong
2020-02-04 4:44 ` [PATCH 5/5] over: simplify read-only vs read-write checking Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200204044425.14031-4-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).