From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 9933C1F4B9 for ; Tue, 4 Feb 2020 04:44:25 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/5] www: serve $INBOX_DIR/description as $INBOX_URL/description Date: Tue, 4 Feb 2020 04:44:22 +0000 Message-Id: <20200204044425.14031-3-e@yhbt.net> In-Reply-To: <20200204044425.14031-1-e@yhbt.net> References: <20200204044425.14031-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Instead of serving $INBOX_DIR/all.git/description, since $INBOX_DIR/all.git/description is not described in the default message when it's missing. --- lib/PublicInbox/WWW.pm | 11 +++++++++++ t/plack.t | 2 ++ t/psgi_v2.t | 3 +++ 3 files changed, 16 insertions(+) diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index 3ce7cc2a..02b5ded3 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -85,6 +85,8 @@ sub call { invalid_inbox($ctx, $1) || get_atom($ctx); } elsif ($path_info =~ m!$INBOX_RE/new\.html\z!o) { invalid_inbox($ctx, $1) || get_new($ctx); + } elsif ($path_info =~ m!$INBOX_RE/description\z!o) { + get_description($ctx, $1); } elsif ($path_info =~ m!$INBOX_RE/(?:(?:git/)?([0-9]+)(?:\.git)?/)? ($PublicInbox::GitHTTPBackend::ANY)\z!ox) { my ($epoch, $path) = ($2, $3); @@ -621,4 +623,13 @@ sub get_css ($$$) { [ 200, $h, [ $css ] ]; } +sub get_description { + my ($ctx, $inbox) = @_; + invalid_inbox($ctx, $inbox) || do { + my $d = $ctx->{-inbox}->description . "\n"; + [ 200, [ 'Content-Length', bytes::length($d), + 'Content-Type', 'text/plain' ], [ $d ] ]; + }; +} + 1; diff --git a/t/plack.t b/t/plack.t index a9a053ed..e23658fd 100644 --- a/t/plack.t +++ b/t/plack.t @@ -189,6 +189,8 @@ test_psgi($app, sub { like($body, qr/test for public-inbox/, "set title in XML feed"); like($body, qr/zzzzzz/, 'body included'); + $res = $cb->(GET($pfx . '/description')); + like($res->content, qr/test for public-inbox/, 'got description'); }); test_psgi($app, sub { diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 2ecd7458..fdd6969f 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -58,6 +58,9 @@ my $www = PublicInbox::WWW->new($config); my ($res, $raw, @from_); test_psgi(sub { $www->call(@_) }, sub { my ($cb) = @_; + $res = $cb->(GET('/v2test/description')); + like($res->content, qr!\$INBOX_DIR/description missing!, + 'got v2 description missing message'); $res = $cb->(GET('/v2test/a-mid@b/raw')); $raw = $res->content; like($raw, qr/^hello world$/m, 'got first message');