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 | 98 +++++++++++++++++-------------------------------
1 files changed, 35 insertions(+), 63 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 ab974dc..f2fbabb 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java
@@ -15,20 +15,15 @@
*/
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;
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.SshCommand;
+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;
@@ -44,46 +39,24 @@
/* List repositories */
@CommandMetaData(name = "list", aliases = { "ls" }, description = "List repositories")
- public static class ListRepositories extends SshCommand {
-
- @Option(name = "--verbose", aliases = { "-v" }, usage = "verbose")
- private boolean verbose;
-
- @Option(name = "--tabbed", aliases = { "-t" }, usage = "as tabbed output")
- private boolean tabbed;
-
- @Argument(index = 0, metaVar = "REGEX", usage = "regex filter expression")
- protected String regexFilter;
+ @UsageExample(syntax = "${cmd} mirror/.* -v", description = "Verbose list of all repositories in the 'mirror' directory")
+ public static class ListRepositories extends ListFilterCommand<RepositoryModel> {
@Override
- public void run() {
+ protected List<RepositoryModel> getItems() {
IGitblit gitblit = getContext().getGitblit();
UserModel user = getContext().getClient().getUser();
-
List<RepositoryModel> repositories = gitblit.getRepositoryModels(user);
- List<RepositoryModel> filtered;
- if (StringUtils.isEmpty(regexFilter)) {
- // no regex filter
- filtered = repositories;
- } else {
- // 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);
- }
+ return repositories;
}
+ @Override
+ protected boolean matches(String filter, RepositoryModel r) {
+ return r.name.matches(filter);
+ }
+
+ @Override
protected void asTable(List<RepositoryModel> list) {
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String[] headers;
if (verbose) {
String[] h = { "Name", "Description", "Owners", "Last Modified", "Size" };
@@ -93,52 +66,51 @@
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);
- String lm = df.format(r.lastChange);
+ String lm = formatDate(r.lastChange);
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));
}
+ @Override
protected void asTabbed(List<RepositoryModel> list) {
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
- String pattern;
if (verbose) {
- pattern = "%s\t%s\t%s\t%s\t%s";
+ for (RepositoryModel r : list) {
+ String lm = formatDate(r.lastChange);
+ String owners = "";
+ if (!ArrayUtils.isEmpty(r.owners)) {
+ owners = Joiner.on(",").join(r.owners);
+ }
+ String size = r.size;
+ if (!r.hasCommits) {
+ lm = "";
+ size = "(empty)";
+ }
+
+ outTabbed(r.name, r.description == null ? "" : r.description,
+ owners, lm, size);
+ }
} else {
- pattern = "%s";
- }
-
- for (RepositoryModel r : list) {
- String lm = df.format(r.lastChange);
- String owners = "";
- if (!ArrayUtils.isEmpty(r.owners)) {
- owners = Joiner.on(",").join(r.owners);
+ for (RepositoryModel r : list) {
+ outTabbed(r.name);
}
- String size = r.size;
- if (!r.hasCommits) {
- lm = "";
- size = "(empty)";
- }
-
- stdout.println(String.format(pattern, r.name, r.description == null ? "" : r.description,
- owners, lm, size));
}
}
}
--
Gitblit v1.9.1