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/RepositoriesDispatcher.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
index 30f7393..ab974dc 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
@@ -16,9 +16,12 @@
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.RepositoryModel;
@@ -49,16 +52,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<RepositoryModel> repositories = gitblit.getRepositoryModels(user);
- if (tabbed) {
- asTabbed(repositories);
+ List<RepositoryModel> filtered;
+ if (StringUtils.isEmpty(regexFilter)) {
+ // no regex filter
+ filtered = repositories;
} else {
- asTable(repositories);
+ // regex filter the list
+ filtered = new ArrayList<RepositoryModel>();
+ for (RepositoryModel r : repositories) {
+ if (r.name.matches(regexFilter)) {
+ filtered.add(r);
+ }
+ }
+ }
+
+ if (tabbed) {
+ asTabbed(filtered);
+ } else {
+ asTable(filtered);
}
}
@@ -69,7 +89,7 @@
String[] h = { "Name", "Description", "Owners", "Last Modified", "Size" };
headers = h;
} else {
- String[] h = { "Name", "Description" };
+ String[] h = { "Name", "Last Modified", "Size" };
headers = h;
}
@@ -77,22 +97,23 @@
for (int i = 0; i < list.size(); i++) {
RepositoryModel r = list.get(i);
+ String lm = df.format(r.lastChange);
+ String size = r.size;
+ if (!r.hasCommits) {
+ lm = "";
+ size = "(empty)";
+ }
if (verbose) {
- String lm = df.format(r.lastChange);
String owners = "";
if (!ArrayUtils.isEmpty(r.owners)) {
owners = Joiner.on(",").join(r.owners);
}
- String size = r.size;
- if (!r.hasCommits) {
- size = "(empty)";
- }
data[i] = new String[] { r.name, r.description, owners, lm, size };
} else {
- data[i] = new String[] { r.name, r.description };
+ data[i] = new String[] { r.name, lm, size };
}
}
- stdout.println(FlipTable.of(headers, data, Borders.BODY_COLS));
+ stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
}
protected void asTabbed(List<RepositoryModel> list) {
@@ -112,6 +133,7 @@
}
String size = r.size;
if (!r.hasCommits) {
+ lm = "";
size = "(empty)";
}
--
Gitblit v1.9.1