From 64b6f382d35e1fea0172b222277dae0312f274e4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 25 Feb 2013 09:41:49 -0500 Subject: [PATCH] Merged LDAP user/team pre-fetching and synchronization enhancement from mschaefers --- src/com/gitblit/models/RepositoryModel.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 167 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java index 9a774fb..a2dab3c 100644 --- a/src/com/gitblit/models/RepositoryModel.java +++ b/src/com/gitblit/models/RepositoryModel.java @@ -17,11 +17,17 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.Constants.AuthorizationControl; import com.gitblit.Constants.FederationStrategy; +import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.StringUtils; /** @@ -38,13 +44,15 @@ // field names are reflectively mapped in EditRepository page public String name; public String description; - public String owner; + public List<String> owners; public Date lastChange; public boolean hasCommits; public boolean showRemoteBranches; public boolean useTickets; public boolean useDocs; public AccessRestrictionType accessRestriction; + public AuthorizationControl authorizationControl; + public boolean allowAuthenticated; public boolean isFrozen; public boolean showReadme; public FederationStrategy federationStrategy; @@ -53,9 +61,30 @@ public boolean skipSizeCalculation; public boolean skipSummaryMetrics; public String frequency; + public boolean isBare; public String origin; + public String HEAD; + public List<String> availableRefs; + public List<String> indexedBranches; public String size; - + public List<String> preReceiveScripts; + public List<String> postReceiveScripts; + public List<String> mailingLists; + public Map<String, String> customFields; + public String projectPath; + private String displayName; + public boolean allowForks; + public Set<String> forks; + public String originRepository; + public boolean verifyCommitter; + public String gcThreshold; + public int gcPeriod; + public int maxActivityCommits; + + public transient boolean isCollectingGarbage; + public Date lastGC; + public String sparkleshareId; + public RepositoryModel() { this("", "", "", new Date(0)); } @@ -63,20 +92,152 @@ public RepositoryModel(String name, String description, String owner, Date lastchange) { this.name = name; this.description = description; - this.owner = owner; this.lastChange = lastchange; this.accessRestriction = AccessRestrictionType.NONE; + this.authorizationControl = AuthorizationControl.NAMED; this.federationSets = new ArrayList<String>(); - this.federationStrategy = FederationStrategy.FEDERATE_THIS; + this.federationStrategy = FederationStrategy.FEDERATE_THIS; + this.projectPath = StringUtils.getFirstPathElement(name); + this.owners = new ArrayList<String>(); + + addOwner(owner); + } + + public List<String> getLocalBranches() { + if (ArrayUtils.isEmpty(availableRefs)) { + return new ArrayList<String>(); + } + List<String> localBranches = new ArrayList<String>(); + for (String ref : availableRefs) { + if (ref.startsWith("refs/heads")) { + localBranches.add(ref); + } + } + return localBranches; + } + + public void addFork(String repository) { + if (forks == null) { + forks = new TreeSet<String>(); + } + forks.add(repository); + } + + public void removeFork(String repository) { + if (forks == null) { + return; + } + forks.remove(repository); + } + + public void resetDisplayName() { + displayName = null; + } + + @Override + public int hashCode() { + return name.hashCode(); + } + + @Override + public boolean equals(Object o) { + if (o instanceof RepositoryModel) { + return name.equals(((RepositoryModel) o).name); + } + return false; } @Override public String toString() { - return name; + if (displayName == null) { + displayName = StringUtils.stripDotGit(name); + } + return displayName; } @Override public int compareTo(RepositoryModel o) { return StringUtils.compareRepositoryNames(name, o.name); } -} \ No newline at end of file + + public boolean isFork() { + return !StringUtils.isEmpty(originRepository); + } + + public boolean isOwner(String username) { + if (StringUtils.isEmpty(username) || ArrayUtils.isEmpty(owners)) { + return false; + } + return owners.contains(username.toLowerCase()); + } + + public boolean isPersonalRepository() { + return !StringUtils.isEmpty(projectPath) && projectPath.charAt(0) == '~'; + } + + public boolean isUsersPersonalRepository(String username) { + return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username); + } + + public boolean allowAnonymousView() { + return !accessRestriction.atLeast(AccessRestrictionType.VIEW); + } + + public boolean isSparkleshared() { + return !StringUtils.isEmpty(sparkleshareId); + } + + public RepositoryModel cloneAs(String cloneName) { + RepositoryModel clone = new RepositoryModel(); + clone.originRepository = name; + clone.name = cloneName; + clone.projectPath = StringUtils.getFirstPathElement(cloneName); + clone.isBare = true; + clone.description = description; + clone.accessRestriction = AccessRestrictionType.PUSH; + clone.authorizationControl = AuthorizationControl.NAMED; + clone.federationStrategy = federationStrategy; + clone.showReadme = showReadme; + clone.showRemoteBranches = false; + clone.allowForks = false; + clone.useDocs = useDocs; + clone.useTickets = useTickets; + clone.skipSizeCalculation = skipSizeCalculation; + clone.skipSummaryMetrics = skipSummaryMetrics; + clone.sparkleshareId = sparkleshareId; + return clone; + } + + public void addOwner(String username) { + if (!StringUtils.isEmpty(username)) { + String name = username.toLowerCase(); + // a set would be more efficient, but this complicates JSON + // deserialization so we enforce uniqueness with an arraylist + if (!owners.contains(name)) { + owners.add(name); + } + } + } + + public void removeOwner(String username) { + if (!StringUtils.isEmpty(username)) { + owners.remove(username.toLowerCase()); + } + } + + public void addOwners(Collection<String> usernames) { + if (!ArrayUtils.isEmpty(usernames)) { + for (String username : usernames) { + addOwner(username); + } + } + } + + public void removeOwners(Collection<String> usernames) { + if (!ArrayUtils.isEmpty(owners)) { + for (String username : usernames) { + removeOwner(username); + } + } + } +} -- Gitblit v1.9.1