update copyrights for 2018

[public-inbox.git] / lib / PublicInbox / NewsWWW.pm

diff --git a/lib/PublicInbox/NewsWWW.pm b/lib/PublicInbox/NewsWWW.pm
index 5357059dee21733a4d9f537f591fd0376ea5fda8..01e34d7b136b9d87e1931f4bac43b635c048de95 100644 (file)
--- a/lib/PublicInbox/NewsWWW.pm
+++ b/lib/PublicInbox/NewsWWW.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # 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,16 +26,16 @@ 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;
                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) . '/';
                        }
                }
 
@@ -44,38 +43,7 @@ sub call {
 
                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
-
-               $url =~ m!/\z! or $url .= '/';
-               $ng_map{$ng} = { url => $url, git_dir => $git_dir };
-       }
-       $self->{ng_map} = \%ng_map;
+       [ 404, [ 'Content-Type' => 'text/plain' ], [ "404 Not Found\n" ] ];
 }
 
 1;