From 5cc48016caf4de3ecce6fbf2f2a34d3bde99edb6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:10 -0400
Subject: [PATCH] Support regex filtering the projects, repositories, and users list
---
src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
index 926d480..212e729 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
@@ -16,12 +16,16 @@
package com.gitblit.transport.ssh.gitblit;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.List;
+import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
+import org.parboiled.common.StringUtils;
import com.gitblit.manager.IGitblit;
import com.gitblit.models.ProjectModel;
+import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.commands.CommandMetaData;
import com.gitblit.transport.ssh.commands.DispatchCommand;
@@ -47,17 +51,33 @@
@Option(name = "--tabbed", aliases = { "-t" }, usage = "as tabbed output")
private boolean tabbed;
+ @Argument(index = 0, metaVar = "REGEX", usage = "regex filter expression")
+ protected String regexFilter;
+
@Override
public void run() {
IGitblit gitblit = getContext().getGitblit();
UserModel user = getContext().getClient().getUser();
List<ProjectModel> projects = gitblit.getProjectModels(user, false);
+ List<ProjectModel> filtered;
+ if (StringUtils.isEmpty(regexFilter)) {
+ // no regex filter
+ filtered = projects;
+ } else {
+ // regex filter the list
+ filtered = new ArrayList<ProjectModel>();
+ for (ProjectModel p : projects) {
+ if (p.name.matches(regexFilter)) {
+ filtered.add(p);
+ }
+ }
+ }
if (tabbed) {
- asTabbed(projects);
+ asTabbed(filtered);
} else {
- asTable(projects);
+ asTable(filtered);
}
}
@@ -67,7 +87,7 @@
String[] h = { "Name", "Description", "Last Modified", "# Repos" };
headers = h;
} else {
- String[] h = { "Name", "Description" };
+ String[] h = { "Name", "Last Modified", "# Repos" };
headers = h;
}
@@ -79,10 +99,10 @@
if (verbose) {
data[i] = new String[] { p.name, p.description, df.format(p.lastChange), "" + p.repositories.size() };
} else {
- data[i] = new String[] { p.name, p.description };
+ data[i] = new String[] { p.name, df.format(p.lastChange), "" + p.repositories.size() };
}
}
- stdout.println(FlipTable.of(headers, data, Borders.BODY_COLS));
+ stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
}
protected void asTabbed(List<ProjectModel> list) {
--
Gitblit v1.9.1