cgi: index pages allow iterating some pagination

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

diff --git a/public-inbox.cgi b/public-inbox.cgi
index bd592ce3e3107c6ed77ea51f0cf0c761284393e4..5e2815801dc338c1df2f06c067533ef1a3086b8b 100755 (executable)
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -65,8 +65,6 @@ sub main {
        } 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, 1);
-       } elsif ($path_info =~ m!$LISTNAME_RE/(?:all\.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);
@@ -78,14 +76,14 @@ 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);
+
+       # 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();
@@ -133,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;
@@ -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',