Merge remote-tracking branch 'origin/search'

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 52e51c435cfbaf2a4cb6abbff0cde3d58af7dd28..bbd438a2d939bc1d42d9fbbcc83b1634ec74d0e8 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -53,8 +53,13 @@ sub run {
        } elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)\.html\z!o) {
                invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx, $cgi);
 
+       # subject_path display
+       } elsif ($path_info =~ m!$LISTNAME_RE/s/(\S+)\.html\z!o) {
+               my $sp = $2;
+               invalid_list(\%ctx, $1) || get_subject_path(\%ctx, $cgi, $sp);
+
        # convenience redirects, order matters
-       } elsif ($path_info =~ m!$LISTNAME_RE/(m|f|t)/(\S+)\z!o) {
+       } elsif ($path_info =~ m!$LISTNAME_RE/(m|f|t|s)/(\S+)\z!o) {
                my $pfx = $2;
                invalid_list_mid(\%ctx, $1, $3) ||
                        redirect_mid(\%ctx, $cgi, $2);
@@ -136,19 +141,10 @@ sub get_index {
 # just returns a string ref for the blob in the current ctx
 sub mid2blob {
        my ($ctx) = @_;
-       my $hex = $ctx->{mid};
-       my ($x2, $x38) = ($hex =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/);
-
-       unless (defined $x38) {
-               # compatibility with old links
-               require Digest::SHA;
-               $hex = Digest::SHA::sha1_hex($hex);
-               ($x2, $x38) = ($hex =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/);
-               defined $x38 or die "BUG: not a SHA-1 hex: $hex";
-       }
-
+       require PublicInbox::MID;
+       my $path = PublicInbox::MID::mid2path($ctx->{mid});
        my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
-                       qw(cat-file blob), "HEAD:$x2/$x38");
+                       qw(cat-file blob), "HEAD:$path");
        my $cmd = join(' ', @cmd);
        my $pid = open my $fh, '-|';
        defined $pid or die "fork failed: $!\n";
@@ -211,6 +207,19 @@ sub get_thread {
          [ $body ] ];
 }
 
+# /$LISTNAME/s/$SUBJECT_PATH.html
+sub get_subject_path {
+       my ($ctx, $cgi, $sp) = @_;
+       $ctx->{subject_path} = $sp;
+       my $srch = searcher($ctx) or return need_search($ctx);
+       require PublicInbox::View;
+       my $foot = footer($ctx);
+       my $body = PublicInbox::View->subject_path_html($ctx, $foot, $srch) or
+               return r404();
+       [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
+         [ $body ] ];
+}
+
 sub self_url {
        my ($cgi) = @_;
        ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;