1 files changed, 22 insertions, 31 deletions

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 4ddc187b..24e24f1e 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -54,10 +54,10 @@ sub call {
         my $method = $env->{REQUEST_METHOD};
 
         if ($method eq 'POST') {
-                if ($path_info =~ m!$INBOX_RE/(git-upload-pack)\z!) {
-                        my $path = $2;
+                if ($path_info =~ m!$INBOX_RE/(?:(\d+)/)?(git-upload-pack)\z!) {
+                        my ($part, $path) = ($2, $3);
                         return invalid_inbox($ctx, $1) ||
-                                serve_git($ctx, $path);
+                                serve_git($ctx, $part, $path);
                 } elsif ($path_info =~ m!$INBOX_RE/!o) {
                         return invalid_inbox($ctx, $1) || mbox_results($ctx);
                 }
@@ -77,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) {
@@ -150,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;
         }
 
@@ -171,14 +169,15 @@ sub invalid_inbox_mid {
         return $ret if $ret;
 
         $ctx->{mid} = $mid;
-        if ($mid =~ /\A[a-f0-9]{40}\z/) {
-                # this is horiffically wasteful for legacy URLs:
-                if ($mid = mid2blob($ctx)) {
-                        require Email::Simple;
-                        use PublicInbox::MID qw/mid_clean/;
-                        my $s = Email::Simple->new($mid);
-                        $ctx->{mid} = mid_clean($s->header('Message-ID'));
-                }
+        my $ibx = $ctx->{-inbox};
+        if ($mid =~ m!\A([a-f0-9]{2})([a-f0-9]{38})\z!) {
+                my ($x2, $x38) = ($1, $2);
+                # this is horrifically wasteful for legacy URLs:
+                my $str = $ctx->{-inbox}->msg_by_path("$x2/$x38") or return;
+                require Email::Simple;
+                my $s = Email::Simple->new($str);
+                $mid = PublicInbox::MID::mid_clean($s->header('Message-ID'));
+                return r301($ctx, $inbox, $mid);
         }
         undef;
 }
@@ -210,30 +209,19 @@ sub get_index {
         }
 }
 
-# just returns a string ref for the blob in the current ctx
-sub mid2blob {
-        my ($ctx) = @_;
-        $ctx->{-inbox}->msg_by_mid($ctx->{mid});
-}
-
 # /$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/
@@ -400,8 +388,11 @@ 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 {