From 53b312fdc03e797d751d73e79a58e2b2bb3f9e87 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:05 -0400
Subject: [PATCH] Simplify show user output
---
src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 ae39500..f2fbabb 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
@@ -22,7 +22,8 @@
import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.commands.CommandMetaData;
import com.gitblit.transport.ssh.commands.DispatchCommand;
-import com.gitblit.transport.ssh.commands.ListCommand;
+import com.gitblit.transport.ssh.commands.ListFilterCommand;
+import com.gitblit.transport.ssh.commands.UsageExample;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.FlipTable;
import com.gitblit.utils.FlipTable.Borders;
@@ -38,7 +39,8 @@
/* List repositories */
@CommandMetaData(name = "list", aliases = { "ls" }, description = "List repositories")
- public static class ListRepositories extends ListCommand<RepositoryModel> {
+ @UsageExample(syntax = "${cmd} mirror/.* -v", description = "Verbose list of all repositories in the 'mirror' directory")
+ public static class ListRepositories extends ListFilterCommand<RepositoryModel> {
@Override
protected List<RepositoryModel> getItems() {
@@ -47,12 +49,12 @@
List<RepositoryModel> repositories = gitblit.getRepositoryModels(user);
return repositories;
}
-
+
@Override
- protected boolean matches(RepositoryModel r) {
- return r.name.matches(regexFilter);
+ protected boolean matches(String filter, RepositoryModel r) {
+ return r.name.matches(filter);
}
-
+
@Override
protected void asTable(List<RepositoryModel> list) {
String[] headers;
@@ -64,7 +66,7 @@
headers = h;
}
- String[][] data = new String[list.size()][];
+ Object[][] data = new Object[list.size()][];
for (int i = 0; i < list.size(); i++) {
RepositoryModel r = list.get(i);
@@ -72,16 +74,16 @@
String size = r.size;
if (!r.hasCommits) {
lm = "";
- size = "(empty)";
+ size = FlipTable.EMPTY;
}
if (verbose) {
String owners = "";
if (!ArrayUtils.isEmpty(r.owners)) {
owners = Joiner.on(",").join(r.owners);
}
- data[i] = new String[] { r.name, r.description, owners, lm, size };
+ data[i] = new Object[] { r.name, r.description, owners, lm, size };
} else {
- data[i] = new String[] { r.name, lm, size };
+ data[i] = new Object[] { r.name, lm, size };
}
}
stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
--
Gitblit v1.9.1