From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] ExtMsg: 300 to external mailing list archives
Date: Thu, 3 Sep 2015 01:57:12 +0000 [thread overview]
Message-ID: <1441245432-16378-4-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1441245432-16378-1-git-send-email-e@80x24.org>
Since cross-posting is inevitable, we shall link to external
message archives for interopability.
---
lib/PublicInbox/ExtMsg.pm | 30 ++++++++++++++++++++++++++++--
public-inbox.cgi | 1 +
t/cgi.t | 6 +++---
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index bdbff78..3e0e6e4 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -7,6 +7,14 @@ use URI::Escape qw(uri_escape_utf8);
use PublicInbox::Hval;
use PublicInbox::MID qw/mid_compress mid2path/;
+# TODO: user-configurable
+our @EXT_URL = (
+ 'http://mid.gmane.org/%s',
+ 'https://lists.debian.org/msgid-search/%s',
+ 'http://mid.mail-archive.com/%s',
+ 'http://marc.info/?i=%s',
+);
+
sub ext_msg {
my ($ctx) = @_;
my $pi_config = $ctx->{pi_config};
@@ -74,9 +82,27 @@ sub ext_msg {
}
}
- # Fall back to external repos
+ my $code = 404;
+ my $h = PublicInbox::Hval->new_msgid($mid, 1);
+ my $href = $h->as_href;
+ my $html = $h->as_html;
+ my $title = "Message-ID <$html> not found";
+
+ # Fall back to external repos if configured
+ my $s = "<html><head><title>$title</title>" .
+ "</head><body><pre><b>$title</b>";
+
+ if (@EXT_URL) {
+ $code = 300;
+ $s .= "\n\nPerhaps try an external site:\n\n";
+ foreach my $u (@EXT_URL) {
+ my $r = sprintf($u, $href);
+ my $t = sprintf($u, $html);
+ $s .= qq{<a\nhref="$r">$t</a>\n};
+ }
+ }
- [404, ['Content-Type'=>'text/plain'], ['Not found']];
+ [300, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
}
# Redirect to another public-inbox which is mapped by $pi_config
diff --git a/public-inbox.cgi b/public-inbox.cgi
index 1fcc04f..b095621 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -17,6 +17,7 @@ BEGIN {
%HTTP_CODES = (
200 => 'OK',
+ 300 => 'Multiple Choices',
301 => 'Moved Permanently',
302 => 'Found',
404 => 'Not Found',
diff --git a/t/cgi.t b/t/cgi.t
index a6600c2..b0af8ae 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -160,19 +160,19 @@ EOF
like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/,
"mid raw hit");
$res = cgi_run("/test/blahblah\@example.con/raw");
- like($res->{head}, qr/Status: 404 Not Found/, "mid raw miss");
+ like($res->{head}, qr/Status: 300 Multiple Choices/, "mid raw miss");
$res = cgi_run("/test/blahblah\@example.com/");
like($res->{body}, qr/\A<html>/, "mid html hit");
like($res->{head}, qr/Status: 200 OK/, "200 response");
$res = cgi_run("/test/blahblah\@example.con/");
- like($res->{head}, qr/Status: 404 Not Found/, "mid html miss");
+ like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
$res = cgi_run("/test/blahblah\@example.com/f/");
like($res->{body}, qr/\A<html>/, "mid html");
like($res->{head}, qr/Status: 200 OK/, "200 response");
$res = cgi_run("/test/blahblah\@example.con/f/");
- like($res->{head}, qr/Status: 404 Not Found/, "mid html miss");
+ like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
$res = cgi_run("/test/");
like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
--
EW
prev parent reply other threads:[~2015-09-03 1:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-03 1:57 [PATCH 0/3] improve external Message-ID handling Eric Wong
2015-09-03 1:57 ` [PATCH 1/3] view: include ghost messages in thread views Eric Wong
2015-09-03 2:04 ` Eric Wong
2015-09-03 1:57 ` [PATCH 2/3] search: disable Message-ID compression in Xapian Eric Wong
2015-09-03 1:57 ` Eric Wong [this message]
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=1441245432-16378-4-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.
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).