From cd45b5fe5ae88c1d526211e67068ce7b2a066d70 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:52 -0400
Subject: [PATCH] Finish user and team administration commands
---
src/main/java/com/gitblit/transport/ssh/gitblit/RepositoriesDispatcher.java | 103 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 35 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 3aaed54..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,19 +15,19 @@
*/
package com.gitblit.transport.ssh.gitblit;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
import java.util.List;
-
-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;
+import com.google.common.base.Joiner;
@CommandMetaData(name = "repositories", aliases = { "repos" }, description = "Repository management commands")
public class RepositoriesDispatcher extends DispatchCommand {
@@ -39,45 +39,78 @@
/* 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;
+ @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();
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-
List<RepositoryModel> repositories = gitblit.getRepositoryModels(user);
- int nameLen = 0;
- int descLen = 0;
- for (RepositoryModel repo : repositories) {
- int len = repo.name.length();
- if (len > nameLen) {
- nameLen = len;
- }
- if (!StringUtils.isEmpty(repo.description)) {
- len = repo.description.length();
- if (len > descLen) {
- descLen = len;
- }
- }
- }
+ return repositories;
+ }
- String pattern;
+ @Override
+ protected boolean matches(String filter, RepositoryModel r) {
+ return r.name.matches(filter);
+ }
+
+ @Override
+ protected void asTable(List<RepositoryModel> list) {
+ String[] headers;
if (verbose) {
- pattern = MessageFormat.format("%-{0,number,0}s\t%-{1,number,0}s\t%s", nameLen, descLen);
+ String[] h = { "Name", "Description", "Owners", "Last Modified", "Size" };
+ headers = h;
} else {
- pattern = "%s";
+ String[] h = { "Name", "Last Modified", "Size" };
+ headers = h;
}
- for (RepositoryModel repo : repositories) {
- stdout.println(String.format(pattern,
- repo.name,
- repo.description == null ? "" : repo.description,
- df.format(repo.lastChange)));
+ Object[][] data = new Object[list.size()][];
+ for (int i = 0; i < list.size(); i++) {
+ RepositoryModel r = list.get(i);
+
+ String lm = formatDate(r.lastChange);
+ String size = r.size;
+ if (!r.hasCommits) {
+ lm = "";
+ size = FlipTable.EMPTY;
+ }
+ if (verbose) {
+ String owners = "";
+ if (!ArrayUtils.isEmpty(r.owners)) {
+ owners = Joiner.on(",").join(r.owners);
+ }
+ data[i] = new Object[] { r.name, r.description, owners, lm, size };
+ } else {
+ data[i] = new Object[] { r.name, lm, size };
+ }
+ }
+ stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
+ }
+
+ @Override
+ protected void asTabbed(List<RepositoryModel> list) {
+ if (verbose) {
+ 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 {
+ for (RepositoryModel r : list) {
+ outTabbed(r.name);
+ }
}
}
}
--
Gitblit v1.9.1