www: support cloning individual v2 git partitions

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 62e4ca43511fc4962cbba6b59b0cdab18444fd99..7bd29732ddd3d54e165b2910c27e25ef14fab087 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Main web interface for mailing list archives
 #
@@ -42,20 +42,25 @@ sub call {
 
        # we don't care about multi-value
        my %qp = map {
+               utf8::decode($_);
                my ($k, $v) = split('=', uri_unescape($_), 2);
                $v = '' unless defined $v;
                $v =~ tr/+/ /;
                ($k, $v)
-       } split(/[&;]/, $env->{QUERY_STRING});
+       } split(/[&;]+/, $env->{QUERY_STRING});
        $ctx->{qp} = \%qp;
 
        my $path_info = $env->{PATH_INFO};
        my $method = $env->{REQUEST_METHOD};
 
-       if ($method eq 'POST' &&
-                $path_info =~ m!$INBOX_RE/(git-upload-pack)\z!) {
-               my $path = $2;
-               return invalid_inbox($ctx, $1) || serve_git($ctx, $path);
+       if ($method eq 'POST') {
+               if ($path_info =~ m!$INBOX_RE/(?:(\d+)/)?(git-upload-pack)\z!) {
+                       my ($part, $path) = ($2, $3);
+                       return invalid_inbox($ctx, $1) ||
+                               serve_git($ctx, $part, $path);
+               } elsif ($path_info =~ m!$INBOX_RE/!o) {
+                       return invalid_inbox($ctx, $1) || mbox_results($ctx);
+               }
        }
        elsif ($method !~ /\AGET|HEAD\z/) {
                return r(405, 'Method Not Allowed');
@@ -72,10 +77,10 @@ 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/
+       } elsif ($path_info =~ m!$INBOX_RE/(?:(\d+)/)?
                                ($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
-               my $path = $2;
-               invalid_inbox($ctx, $1) || serve_git($ctx, $path);
+               my ($part, $path) = ($2, $3);
+               invalid_inbox($ctx, $1) || serve_git($ctx, $part, $path);
        } elsif ($path_info =~ m!$INBOX_RE/([\w-]+).mbox\.gz\z!o) {
                serve_mbox_range($ctx, $1, $2);
        } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/$END_RE\z!o) {
@@ -145,10 +150,8 @@ sub invalid_inbox ($$) {
        my $www = $ctx->{www};
        my $obj = $www->{pi_config}->lookup_name($inbox);
        if (defined $obj) {
-               $ctx->{git_dir} = $obj->{mainrepo};
                $ctx->{git} = $obj->git;
                $ctx->{-inbox} = $obj;
-               $ctx->{inbox} = $inbox;
                return;
        }
 
@@ -214,21 +217,16 @@ sub mid2blob {
 # /$INBOX/$MESSAGE_ID/raw                    -> raw mbox
 sub get_mid_txt {
        my ($ctx) = @_;
-       my $x = mid2blob($ctx) or return r404($ctx);
        require PublicInbox::Mbox;
-       PublicInbox::Mbox::emit1($ctx, $x);
+       PublicInbox::Mbox::emit_raw($ctx) || r404($ctx);
 }
 
 # /$INBOX/$MESSAGE_ID/                   -> HTML content (short quotes)
 sub get_mid_html {
        my ($ctx) = @_;
-       my $x = mid2blob($ctx) or return r404($ctx);
-
        require PublicInbox::View;
-       require PublicInbox::MIME;
-       my $mime = PublicInbox::MIME->new($x);
        searcher($ctx);
-       PublicInbox::View::msg_html($ctx, $mime);
+       PublicInbox::View::msg_page($ctx) || r404($ctx);
 }
 
 # /$INBOX/$MESSAGE_ID/t/
@@ -395,8 +393,21 @@ sub msg_page {
 }
 
 sub serve_git {
-       my ($ctx, $path) = @_;
-       PublicInbox::GitHTTPBackend::serve($ctx->{env}, $ctx->{git}, $path);
+       my ($ctx, $part, $path) = @_;
+       my $env = $ctx->{env};
+       my $ibx = $ctx->{-inbox};
+       my $git = defined $part ? $ibx->git_part($part) : $ibx->git;
+       $git ? PublicInbox::GitHTTPBackend::serve($env, $git, $path) : r404();
+}
+
+sub mbox_results {
+       my ($ctx) = @_;
+       if ($ctx->{env}->{QUERY_STRING} =~ /(?:\A|[&;])q=/) {
+               searcher($ctx) or return need_search($ctx);
+               require PublicInbox::SearchView;
+               return PublicInbox::SearchView::mbox_results($ctx);
+       }
+       r404();
 }
 
 sub serve_mbox_range {