X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNewsWWW.pm;h=01e34d7b136b9d87e1931f4bac43b635c048de95;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=19eb596cea2a1563489ae2d6107a8e3643248cec;hpb=f850effe0baef8a37ad2eef3ef581b79539cc304;p=public-inbox.git
diff --git a/lib/PublicInbox/NewsWWW.pm b/lib/PublicInbox/NewsWWW.pm
index 19eb596c..01e34d7b 100644
--- a/lib/PublicInbox/NewsWWW.pm
+++ b/lib/PublicInbox/NewsWWW.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2018 all contributors
# License: AGPL-3.0+
#
# Plack app redirector for mapping /$NEWSGROUP requests to
@@ -9,7 +9,7 @@ package PublicInbox::NewsWWW;
use strict;
use warnings;
use PublicInbox::Config;
-use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::MID qw(mid_escape);
sub new {
my ($class, $pi_config) = @_;
@@ -19,7 +19,6 @@ sub new {
sub call {
my ($self, $env) = @_;
- my $ng_map = $self->newsgroup_map;
my $path = $env->{PATH_INFO};
$path =~ s!\A/+!!;
$path =~ s!/+\z!!;
@@ -27,54 +26,24 @@ sub call {
# some links may have the article number in them:
# /inbox.foo.bar/123456
my ($ng, $article) = split(m!/+!, $path, 2);
- if (my $info = $ng_map->{$ng}) {
- my $url = PublicInbox::Hval::prurl($env, $info->{url});
+ if (my $inbox = $self->{pi_config}->lookup_newsgroup($ng)) {
+ my $url = PublicInbox::Hval::prurl($env, $inbox->{url});
my $code = 301;
- my $h = [ Location => $url, 'Content-Type' => 'text/plain' ];
if (defined $article && $article =~ /\A\d+\z/) {
- my $mid = eval { ng_mid_for($ng, $info, $article) };
+ my $mid = eval { $inbox->mm->mid_for($article) };
if (defined $mid) {
# article IDs are not stable across clones,
# do not encourage caching/bookmarking them
$code = 302;
- $url .= uri_escape_utf8($mid) . '/';
+ $url .= mid_escape($mid) . '/';
}
}
- return [ $code, $h, [ "Redirecting to $url\n" ] ]
- }
- [ 404, [ 'Content-Type' => 'text/plain' ], [] ];
-}
-
-sub ng_mid_for {
- my ($ng, $info, $article) = @_;
- # may fail due to lack of Danga::Socket
- # for defer_weaken:
- require PublicInbox::NewsGroup;
- $ng = $info->{ng} ||=
- PublicInbox::NewsGroup->new($ng, $info->{git_dir}, '');
- $ng->mm->mid_for($article);
-}
-
-sub newsgroup_map {
- my ($self) = @_;
- my $rv;
- $rv = $self->{ng_map} and return $rv;
- my $pi_config = $self->{pi_config};
- my %ng_map;
- foreach my $k (keys %$pi_config) {
- $k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
- my $inbox = $1;
- my $git_dir = $pi_config->{"publicinbox.$inbox.mainrepo"};
- my $url = $pi_config->{"publicinbox.$inbox.url"};
- defined $url or next;
- my $ng = $pi_config->{"publicinbox.$inbox.newsgroup"};
- next if (!defined $ng) || ($ng eq ''); # disabled
+ my $h = [ Location => $url, 'Content-Type' => 'text/plain' ];
- $url =~ m!/\z! or $url .= '/';
- $ng_map{$ng} = { url => $url, git_dir => $git_dir };
+ return [ $code, $h, [ "Redirecting to $url\n" ] ]
}
- $self->{ng_map} = \%ng_map;
+ [ 404, [ 'Content-Type' => 'text/plain' ], [ "404 Not Found\n" ] ];
}
1;