unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH 1/5] www: minor cleanups to shorten code
Date: Thu, 27 Aug 2015 04:33:58 +0000	[thread overview]
Message-ID: <1440650042-26176-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1440650042-26176-1-git-send-email-e@80x24.org>

Less scrolling is more efficient.
---
 lib/PublicInbox/WWW.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index d1ee2ff..527d213 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -138,7 +138,6 @@ sub mid2blob {
 	my $path = PublicInbox::MID::mid2path($ctx->{mid});
 	my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
 			qw(cat-file blob), "HEAD:$path");
-	my $cmd = join(' ', @cmd);
 	my $pid = open my $fh, '-|';
 	defined $pid or die "fork failed: $!\n";
 	if ($pid == 0) {
@@ -162,8 +161,7 @@ sub get_mid_txt {
 # /$LISTNAME/m/$MESSAGE_ID.html                   -> HTML content (short quotes)
 sub get_mid_html {
 	my ($ctx) = @_;
-	my $x = mid2blob($ctx);
-	return r404() unless $x;
+	my $x = mid2blob($ctx) or return r404();
 
 	require PublicInbox::View;
 	my $pfx = msg_pfx($ctx);
@@ -178,8 +176,8 @@ sub get_mid_html {
 # /$LISTNAME/f/$MESSAGE_ID.html                   -> HTML content (fullquotes)
 sub get_full_html {
 	my ($ctx) = @_;
-	my $x = mid2blob($ctx);
-	return r404() unless $x;
+	my $x = mid2blob($ctx) or return r404();
+
 	require PublicInbox::View;
 	my $foot = footer($ctx);
 	require Email::MIME;
-- 
EW


  reply	other threads:[~2015-08-27  4:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-27  4:33 [PATCH 0/5] prefer shorter, less-ambiguous URLs Eric Wong
2015-08-27  4:33 ` Eric Wong [this message]
2015-08-27  4:33 ` [PATCH 2/5] wire up shorter, less ambiguous URLs Eric Wong
2015-08-27  4:34 ` [PATCH 3/5] mid: extract Message-ID from inside '<>' Eric Wong
2015-08-27  4:34 ` [PATCH 4/5] wire up to display non-suffixed Message-ID links Eric Wong
2015-08-27  4:34 ` [PATCH 5/5] implement legacy redirects for old URLs 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: https://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=1440650042-26176-2-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --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.
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).