Skip to content

Commit

Permalink
Merge branch 'bl/gitweb-project-filter'
Browse files Browse the repository at this point in the history 
* bl/gitweb-project-filter:
  gitweb: Make project search respect project_filter
  gitweb: improve usability of projects search form
  gitweb: place links to parent directories in page header
  gitweb: show active project_filter in project_list page header
  gitweb: limit links to alternate forms of project_list to active project_filter
  gitweb: add project_filter to limit project list to a subdirectory
  gitweb: prepare git_get_projects_list for use outside 'forks'.
  gitweb: move hard coded .git suffix out of git_get_projects_list
  • Loading branch information
Junio C Hamano committed Feb 7, 2012
2 parents 6f1ede8 + abc0c9d commit 715d130
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 20 deletions.
108 changes: 89 additions & 19 deletions gitweb/gitweb.perl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,7 @@ sub check_loadavg {
search_use_regexp => "sr",
ctag => "by_tag",
diff_style => "ds",
project_filter => "pf",
# this must be last entry (for manipulation from JavaScript)
javascript => "js"
);
Expand Down Expand Up @@ -976,7 +977,7 @@ sub evaluate_path_info {

our ($action, $project, $file_name, $file_parent, $hash, $hash_parent, $hash_base,
$hash_parent_base, @extra_options, $page, $searchtype, $search_use_regexp,
$searchtext, $search_regexp);
$searchtext, $search_regexp, $project_filter);
sub evaluate_and_validate_params {
our $action = $input_params{'action'};
if (defined $action) {
Expand All @@ -994,6 +995,13 @@ sub evaluate_and_validate_params {
}
}

our $project_filter = $input_params{'project_filter'};
if (defined $project_filter) {
if (!validate_pathname($project_filter)) {
die_error(404, "Invalid project_filter parameter");
}
}

our $file_name = $input_params{'file_name'};
if (defined $file_name) {
if (!validate_pathname($file_name)) {
Expand Down Expand Up @@ -2829,10 +2837,9 @@ sub git_get_project_url_list {

sub git_get_projects_list {
my $filter = shift || '';
my $paranoid = shift;
my @list;

$filter =~ s/\.git$//;

if (-d $projects_list) {
# search in directory
my $dir = $projects_list;
Expand All @@ -2841,7 +2848,7 @@ sub git_get_projects_list {
my $pfxlen = length("$dir");
my $pfxdepth = ($dir =~ tr!/!!);
# when filtering, search only given subdirectory
if ($filter) {
if ($filter && !$paranoid) {
$dir .= "/$filter";
$dir =~ s!/+$!!;
}
Expand All @@ -2866,6 +2873,10 @@ sub git_get_projects_list {
}

my $path = substr($File::Find::name, $pfxlen + 1);
# paranoidly only filter here
if ($paranoid && $filter && $path !~ m!^\Q$filter\E/!) {
next;
}
# we check related file in $projectroot
if (check_export_ok("$projectroot/$path")) {
push @list, { path => $path };
Expand Down Expand Up @@ -3731,7 +3742,12 @@ sub run_highlighter {
sub get_page_title {
my $title = to_utf8($site_name);

return $title unless (defined $project);
unless (defined $project) {
if (defined $project_filter) {
$title .= " - " . to_utf8($project_filter);
}
return $title;
}
$title .= " - " . to_utf8($project);

return $title unless (defined $action);
Expand Down Expand Up @@ -3825,12 +3841,27 @@ sub print_header_links {
}
}

sub print_nav_breadcrumbs_path {
my $dirprefix = undef;
while (my $part = shift) {
$dirprefix .= "/" if defined $dirprefix;
$dirprefix .= $part;
print $cgi->a({-href => href(project => undef,
project_filter => $dirprefix,
action => "project_list")},
esc_html($part)) . " / ";
}
}

sub print_nav_breadcrumbs {
my %opts = @_;

print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
if (defined $project) {
print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
my @dirname = split '/', $project;
my $projectbasename = pop @dirname;
print_nav_breadcrumbs_path(@dirname);
print $cgi->a({-href => href(action=>"summary")}, esc_html($projectbasename));
if (defined $action) {
my $action_print = $action ;
if (defined $opts{-action_extra}) {
Expand All @@ -3843,6 +3874,8 @@ sub print_nav_breadcrumbs {
print " / $opts{-action_extra}";
}
print "\n";
} elsif (defined $project_filter) {
print_nav_breadcrumbs_path(split '/', $project_filter);
}
}

Expand Down Expand Up @@ -3965,9 +3998,11 @@ sub git_footer_html {
}

} else {
print $cgi->a({-href => href(project=>undef, action=>"opml"),
print $cgi->a({-href => href(project=>undef, action=>"opml",
project_filter => $project_filter),
-class => $feed_class}, "OPML") . " ";
print $cgi->a({-href => href(project=>undef, action=>"project_index"),
print $cgi->a({-href => href(project=>undef, action=>"project_index",
project_filter => $project_filter),
-class => $feed_class}, "TXT") . "\n";
}
print "</div>\n"; # class="page_footer"
Expand Down Expand Up @@ -5125,6 +5160,34 @@ sub git_patchset_body {

# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

sub git_project_search_form {
my ($searchtext, $search_use_regexp);

my $limit = '';
if ($project_filter) {
$limit = " in '$project_filter/'";
}

print "<div class=\"projsearch\">\n";
print $cgi->startform(-method => 'get', -action => $my_uri) .
$cgi->hidden(-name => 'a', -value => 'project_list') . "\n";
print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n"
if (defined $project_filter);
print $cgi->textfield(-name => 's', -value => $searchtext,
-title => "Search project by name and description$limit",
-size => 60) . "\n" .
"<span title=\"Extended regular expression\">" .
$cgi->checkbox(-name => 'sr', -value => 1, -label => 're',
-checked => $search_use_regexp) .
"</span>\n" .
$cgi->submit(-name => 'btnS', -value => 'Search') .
$cgi->end_form() . "\n" .
$cgi->a({-href => href(project => undef, searchtext => undef,
project_filter => $project_filter)},
esc_html("List all projects$limit")) . "<br />\n";
print "</div>\n";
}

# fills project list info (age, description, owner, category, forks)
# for each project in the list, removing invalid projects from
# returned list
Expand Down Expand Up @@ -5981,7 +6044,7 @@ sub git_project_list {
die_error(400, "Unknown order parameter");
}

my @list = git_get_projects_list();
my @list = git_get_projects_list($project_filter, $strict_export);
if (!@list) {
die_error(404, "No projects found");
}
Expand All @@ -5992,11 +6055,8 @@ sub git_project_list {
insert_file($home_text);
print "</div>\n";
}
print $cgi->startform(-method => "get") .
"<p class=\"projsearch\">Search:\n" .
$cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
"</p>" .
$cgi->end_form() . "\n";

git_project_search_form($searchtext, $search_use_regexp);
git_project_list_body(\@list, $order);
git_footer_html();
}
Expand All @@ -6007,7 +6067,9 @@ sub git_forks {
die_error(400, "Unknown order parameter");
}

my @list = git_get_projects_list($project);
my $filter = $project;
$filter =~ s/\.git$//;
my @list = git_get_projects_list($filter);
if (!@list) {
die_error(404, "No forks found");
}
Expand All @@ -6020,7 +6082,7 @@ sub git_forks {
}

sub git_project_index {
my @projects = git_get_projects_list();
my @projects = git_get_projects_list($project_filter, $strict_export);
if (!@projects) {
die_error(404, "No projects found");
}
Expand Down Expand Up @@ -6066,7 +6128,9 @@ sub git_summary {

if ($check_forks) {
# find forks of a project
@forklist = git_get_projects_list($project);
my $filter = $project;
$filter =~ s/\.git$//;
@forklist = git_get_projects_list($filter);
# filter out forks of forks
@forklist = filter_forks_from_projects_list(\@forklist)
if (@forklist);
Expand Down Expand Up @@ -7857,7 +7921,7 @@ sub git_atom {
}

sub git_opml {
my @list = git_get_projects_list();
my @list = git_get_projects_list($project_filter, $strict_export);
if (!@list) {
die_error(404, "No projects found");
}
Expand All @@ -7868,11 +7932,17 @@ sub git_opml {
-content_disposition => 'inline; filename="opml.xml"');

my $title = esc_html($site_name);
my $filter = " within subdirectory ";
if (defined $project_filter) {
$filter .= esc_html($project_filter);
} else {
$filter = "";
}
print <<XML;
<?xml version="1.0" encoding="utf-8"?>
<opml version="1.0">
<head>
<title>$title OPML Export</title>
<title>$title OPML Export$filter</title>
</head>
<body>
<outline text="git RSS feeds">
Expand Down
7 changes: 6 additions & 1 deletion gitweb/static/gitweb.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,13 @@ div.search {
right: 12px
}

p.projsearch {
div.projsearch {
text-align: center;
margin: 20px 0px;
}

div.projsearch form {
margin-bottom: 2px;
}

td.linenr {
Expand Down

0 comments on commit 715d130

Please sign in to comment.