gitweb: more support for PATH_INFO based URLs

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 13fd98444a8ba76bd82cd8f0f2b9bb52b64b6a0090504d54c688dcad9965e847..e260c9cf1fe4167c298efcba174723110c2a3819af032c8218cc3d19aa628332 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -196,12 +196,7 @@ if (defined $action) {
        }
 }
 
-our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
-if (defined $project) {
-       $project =~ s|^/||;
-       $project =~ s|/$||;
-       $project = undef unless $project;
-}
+our $project = $cgi->param('p');
 if (defined $project) {
        if (!validate_input($project)) {
                die_error(undef, "Invalid project parameter");
@@ -212,7 +207,6 @@ if (defined $project) {
        if (!(-e "$projectroot/$project/HEAD")) {
                die_error(undef, "No such project");
        }
-       $git_dir = "$projectroot/$project";
 }
 
 our $file_name = $cgi->param('f');
@@ -272,6 +266,32 @@ if (defined $searchtext) {
        $searchtext = quotemeta $searchtext;
 }
 
+# now read PATH_INFO and use it as alternative to parameters
+our $path_info = $ENV{"PATH_INFO"};
+$path_info =~ s|^/||;
+$path_info =~ s|/$||;
+if (validate_input($path_info) && !defined $project) {
+       $project = $path_info;
+       while ($project && !-e "$projectroot/$project/HEAD") {
+               $project =~ s,/*[^/]*$,,;
+       }
+       if (defined $project) {
+               $project = undef unless $project;
+       }
+       if ($path_info =~ m,^$project/([^/]+)/(.+)$,) {
+               # we got "project.git/branch/filename"
+               $action    ||= "blob_plain";
+               $hash_base ||= $1;
+               $file_name ||= $2;
+       } elsif ($path_info =~ m,^$project/([^/]+)$,) {
+               # we got "project.git/branch"
+               $action ||= "shortlog";
+               $hash   ||= $1;
+       }
+}
+
+$git_dir = "$projectroot/$project";
+
 # dispatch
 my %actions = (
        "blame" => \&git_blame2,
@@ -326,11 +346,12 @@ sub href(%) {
                hash_base => "hb",
                hash_parent_base => "hpb",
                page => "pg",
+               order => "o",
                searchtext => "s",
        );
        my %mapping = @mapping;
 
-       $params{"project"} ||= $project;
+       $params{'project'} = $project unless exists $params{'project'};
 
        my @result = ();
        for (my $i = 0; $i < @mapping; $i += 2) {
@@ -1254,6 +1275,13 @@ EOF
                printf('<link rel="alternate" title="%s log" '.
                       'href="%s" type="application/rss+xml"/>'."\n",
                       esc_param($project), href(action=>"rss"));
+       } else {
+               printf('<link rel="alternate" title="%s projects list" '.
+                      'href="%s" type="text/plain; charset=utf-8"/>'."\n",
+                      $site_name, href(project=>undef, action=>"project_index"));
+               printf('<link rel="alternate" title="%s projects logs" '.
+                      'href="%s" type="text/x-opml"/>'."\n",
+                      $site_name, href(project=>undef, action=>"opml"));
        }
        if (defined $favicon) {
                print qq(<link rel="shortcut icon" href="$favicon" type="image/png"/>\n);
@@ -1304,9 +1332,13 @@ sub git_footer_html {
                if (defined $descr) {
                        print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                }
-               print $cgi->a({-href => href(action=>"rss"), -class => "rss_logo"}, "RSS") . "\n";
+               print $cgi->a({-href => href(action=>"rss"),
+                             -class => "rss_logo"}, "RSS") . "\n";
        } else {
-               print $cgi->a({-href => href(action=>"opml"), -class => "rss_logo"}, "OPML") . "\n";
+               print $cgi->a({-href => href(project=>undef, action=>"opml"),
+                             -class => "rss_logo"}, "OPML") . " ";
+               print $cgi->a({-href => href(project=>undef, action=>"project_index"),
+                             -class => "rss_logo"}, "TXT") . "\n";
        }
        print "</div>\n" .
              "</body>\n" .
@@ -2153,7 +2185,7 @@ sub git_project_list {
                print "<th>Project</th>\n";
        } else {
                print "<th>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("o=project"),
+                     $cgi->a({-href => href(project=>undef, order=>'project'),
                               -class => "header"}, "Project") .
                      "</th>\n";
        }
@@ -2162,7 +2194,7 @@ sub git_project_list {
                print "<th>Description</th>\n";
        } else {
                print "<th>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("o=descr"),
+                     $cgi->a({-href => href(project=>undef, order=>'descr'),
                               -class => "header"}, "Description") .
                      "</th>\n";
        }
@@ -2171,7 +2203,7 @@ sub git_project_list {
                print "<th>Owner</th>\n";
        } else {
                print "<th>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("o=owner"),
+                     $cgi->a({-href => href(project=>undef, order=>'owner'),
                               -class => "header"}, "Owner") .
                      "</th>\n";
        }
@@ -2180,7 +2212,7 @@ sub git_project_list {
                print "<th>Last Change</th>\n";
        } else {
                print "<th>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("o=age"),
+                     $cgi->a({-href => href(project=>undef, order=>'age'),
                               -class => "header"}, "Last Change") .
                      "</th>\n";
        }