* [PATCH 2/5] www: serve $INBOX_DIR/description as $INBOX_URL/description
2020-02-04 4:44 6% [PATCH 0/5] a few more minor fixups Eric Wong
@ 2020-02-04 4:44 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-02-04 4:44 UTC (permalink / raw)
To: meta
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/<title>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');
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] a few more minor fixups
@ 2020-02-04 4:44 6% Eric Wong
2020-02-04 4:44 7% ` [PATCH 2/5] www: serve $INBOX_DIR/description as $INBOX_URL/description Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-02-04 4:44 UTC (permalink / raw)
To: meta
Nothing earth shattering, serving $INBOX_URL/description
properly for v2 inboxes should make it easier to mirror
while preserving descriptions (only per-epoch descriptions
are propagated in manifest.js.gz).
Eric Wong (5):
www: stricter regexp for 405 errors
www: serve $INBOX_DIR/description as $INBOX_URL/description
inbox: simplify ->description and ->cloneurl
inbox: remove TODO item for msg_by_path
over: simplify read-only vs read-write checking
lib/PublicInbox/Inbox.pm | 26 ++++++++++----------------
lib/PublicInbox/Over.pm | 7 +++----
lib/PublicInbox/OverIdx.pm | 2 +-
lib/PublicInbox/WWW.pm | 13 ++++++++++++-
t/httpd.t | 5 +++++
t/over.t | 7 ++++++-
t/plack.t | 2 ++
t/psgi_v2.t | 3 +++
8 files changed, 42 insertions(+), 23 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-02-04 4:44 6% [PATCH 0/5] a few more minor fixups Eric Wong
2020-02-04 4:44 7% ` [PATCH 2/5] www: serve $INBOX_DIR/description as $INBOX_URL/description Eric Wong
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).