mda: share commit setup code with -learn

[public-inbox.git] / public-inbox.cgi

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 17eb5b7beb4e0626c7bf6e135f5587cbce0d48a5..5e2815801dc338c1df2f06c067533ef1a3086b8b 100755 (executable)
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -15,9 +15,9 @@ use warnings;
 use CGI qw(:cgi :escapeHTML -nosticky); # PSGI/FastCGI/mod_perl compat
 use Encode qw(decode_utf8);
 use PublicInbox::Config;
-use URI::Escape qw(uri_unescape);
+use URI::Escape qw(uri_escape uri_unescape);
 use Digest::SHA qw(sha1_hex);
-our $LISTNAME_RE = qr!\A(?:/.*?)?/([\w\.\-]+)!;
+our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $pi_config;
 BEGIN {
        $pi_config = PublicInbox::Config->new;
@@ -62,8 +62,10 @@ sub main {
        # top-level indices and feeds
        if ($path_info eq "/") {
                r404();
-       } elsif ($path_info =~ m!$LISTNAME_RE/(?:index\.html)?\z!o) {
-               invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 1);
+       } elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
+               invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
+       } elsif ($path_info =~ m!$LISTNAME_RE(?:/|/index\.html)?\z!o) {
+               invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0);
        } elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) {
                invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1);
        } elsif ($path_info =~ m!$LISTNAME_RE/all\.atom\.xml\z!o) {
@@ -74,17 +76,15 @@ sub main {
                invalid_list_mid(\%ctx, $1, $2) || get_mid_txt(\%ctx, $cgi);
        } elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\.html\z!o) {
                invalid_list_mid(\%ctx, $1, $2) || get_mid_html(\%ctx, $cgi);
-       } elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\z!o) {
-               redirect_mid_html($cgi, $1, $2);
 
        # full-message page
        } elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\.html\z!o) {
                invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx, $cgi);
-       } elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\z!o) {
-               redirect_mid_html($cgi, $1, $2);
 
-       } elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
-               invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
+       # convenience redirect
+       } elsif ($path_info =~ m!$LISTNAME_RE/(?:m|f)/(\S+)\z!o) {
+               invalid_list_mid(\%ctx, $1, $2) || redirect_mid(\%ctx, $cgi);
+
        } else {
                r404();
        }
@@ -93,7 +93,7 @@ sub main {
 sub r404 { r("404 Not Found") }
 
 # simple response for errors
-sub r { [ $_[0], { 'Content-Type' => 'text/plain' }, '' ] }
+sub r { [ $_[0], { 'Content-Type' => 'text/plain' }, $_[0]."\n" ] }
 
 # returns undef if valid, array ref response if invalid
 sub invalid_list {
@@ -131,7 +131,7 @@ sub get_atom {
        ];
 }
 
-# /$LISTNAME/?before=$GIT_COMMIT                 -> HTML only
+# /$LISTNAME/?r=$GIT_COMMIT                 -> HTML only
 sub get_index {
        my ($ctx, $cgi, $top) = @_;
        require PublicInbox::Feed;
@@ -170,9 +170,7 @@ sub get_mid_html {
        my $x = mid2blob($ctx);
        return r404() unless $x;
 
-       my $pfx = $cgi->self_url;
-       $pfx =~ s!/m/.+\z!/!; # FIXME: this is not robust
-
+       my $pfx = "../f/" . uri_escape($ctx->{mid}) . ".html";
        require PublicInbox::View;
        require Email::MIME;
        [ "200 OK", {'Content-Type' => 'text/html'},
@@ -195,6 +193,13 @@ sub redirect_list_index {
        do_redirect($cgi->self_url . "/");
 }
 
+sub redirect_mid {
+       my ($ctx, $cgi) = @_;
+       my $url = $cgi->self_url;
+       $url =~ s!/f/!/m/!;
+       do_redirect($url . '.html');
+}
+
 sub do_redirect {
        my ($url) = @_;
        [ '301 Moved Permanently',