opendev/gerrit
Code Issues Proposed changes

Add support for regex in project list screen

Browse Source 
Add support for regex in project list screen filter. If filter start
with '^', then the filter will be interpreted as a regex.

Feature: Issue 2751
Change-Id: I1cf8a0f9fc18a6e286a2a26c71be77f1d4f16741
This commit is contained in:
Hugo Arès
2014-07-08 11:04:43 -04:00
parent 91b7f7ce39
commit b8aae411a8
4 changed files with 99 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
View File

@@ -23,6 +23,7 @@ import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.common.errors.NoSuchGroupException;
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.common.WebLinkInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.BinaryResult;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
@@ -42,6 +43,9 @@ import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
import com.google.inject.Provider;
import dk.brics.automaton.RegExp;
import dk.brics.automaton.RunAutomaton;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
@@ -163,6 +167,11 @@ public class ListProjects implements RestReadView<TopLevelResource> {
this.matchSubstring = matchSubstring;
}
@Option(name = "-r", metaVar = "REGEX", usage = "match project regex")
public void setMatchRegex(String matchRegex) {
this.matchRegex = matchRegex;
}
@Option(name = "--has-acl-for", metaVar = "GROUP", usage =
"displays only projects on which access rights for this group are directly assigned")
public void setGroupUuid(AccountGroup.UUID groupUuid) {
@@ -178,6 +187,7 @@ public class ListProjects implements RestReadView<TopLevelResource> {
private int start;
private String matchPrefix;
private String matchSubstring;
private String matchRegex;
private AccountGroup.UUID groupUuid;
@Inject
@@ -216,7 +226,7 @@ public class ListProjects implements RestReadView<TopLevelResource> {
}
@Override
public Object apply(TopLevelResource resource) {
public Object apply(TopLevelResource resource) throws BadRequestException {
if (format == OutputFormat.TEXT) {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
display(buf);
@@ -227,12 +237,13 @@ public class ListProjects implements RestReadView<TopLevelResource> {
return apply();
}
public Map<String, ProjectInfo> apply() {
public Map<String, ProjectInfo> apply() throws BadRequestException {
format = OutputFormat.JSON;
return display(null);
}
public Map<String, ProjectInfo> display(OutputStream displayOutputStream) {
public Map<String, ProjectInfo> display(OutputStream displayOutputStream)
throws BadRequestException {
PrintWriter stdout = null;
if (displayOutputStream != null) {
try {
@@ -436,7 +447,7 @@ public class ListProjects implements RestReadView<TopLevelResource> {
}
}
private Iterable<Project.NameKey> scan() {
private Iterable<Project.NameKey> scan() throws BadRequestException {
if (matchPrefix != null) {
return projectCache.byName(matchPrefix);
} else if (matchSubstring != null) {
@@ -447,6 +458,28 @@ public class ListProjects implements RestReadView<TopLevelResource> {
.contains(matchSubstring.toLowerCase(Locale.US));
}
});
} else if (matchRegex != null) {
if (matchRegex.startsWith("^")) {
matchRegex = matchRegex.substring(1);
if (matchRegex.endsWith("$") && !matchRegex.endsWith("\\$")) {
matchRegex = matchRegex.substring(0, matchRegex.length() - 1);
}
}
if (matchRegex.equals(".*")) {
return projectCache.all();
}
try {
final RunAutomaton a =
new RunAutomaton(new RegExp(matchRegex).toAutomaton());
return Iterables.filter(projectCache.all(),
new Predicate<Project.NameKey>() {
public boolean apply(Project.NameKey in) {
return a.run(in.get());
}
});
} catch (IllegalArgumentException e) {
throw new BadRequestException(e.getMessage());
}
} else {
return projectCache.all();
}