From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit

---
 src/main/java/com/gitblit/models/Activity.java |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 163 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/models/Activity.java b/src/main/java/com/gitblit/models/Activity.java
new file mode 100644
index 0000000..8af86d6
--- /dev/null
+++ b/src/main/java/com/gitblit/models/Activity.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.models;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
+
+/**
+ * Model class to represent the commit activity across many repositories. This
+ * class is used by the Activity page.
+ * 
+ * @author James Moger
+ */
+public class Activity implements Serializable, Comparable<Activity> {
+
+	private static final long serialVersionUID = 1L;
+
+	public final Date startDate;
+
+	public final Date endDate;
+	
+	private final Set<RepositoryCommit> commits;
+
+	private final Map<String, Metric> authorMetrics;
+
+	private final Map<String, Metric> repositoryMetrics;
+
+	private final Set<String> authorExclusions;
+
+	/**
+	 * Constructor for one day of activity.
+	 * 
+	 * @param date
+	 */
+	public Activity(Date date) {
+		this(date, TimeUtils.ONEDAY - 1);
+	}
+
+	/**
+	 * Constructor for specified duration of activity from start date.
+	 * 
+	 * @param date
+	 *            the start date of the activity
+	 * @param duration
+	 *            the duration of the period in milliseconds
+	 */
+	public Activity(Date date, long duration) {
+		startDate = date;
+		endDate = new Date(date.getTime() + duration);
+		commits = new LinkedHashSet<RepositoryCommit>();
+		authorMetrics = new HashMap<String, Metric>();
+		repositoryMetrics = new HashMap<String, Metric>();
+		authorExclusions = new TreeSet<String>();
+	}
+	
+	/**
+	 * Exclude the specified authors from the metrics.
+	 * 
+	 * @param authors
+	 */
+	public void excludeAuthors(Collection<String> authors) {
+		for (String author : authors) {
+			authorExclusions.add(author.toLowerCase());
+		}
+	}
+
+	/**
+	 * Adds a commit to the activity object as long as the commit is not a
+	 * duplicate.
+	 * 
+	 * @param repository
+	 * @param branch
+	 * @param commit
+	 * @return a RepositoryCommit, if one was added. Null if this is duplicate
+	 *         commit
+	 */
+	public RepositoryCommit addCommit(String repository, String branch, RevCommit commit) {
+		RepositoryCommit commitModel = new RepositoryCommit(repository, branch, commit);
+		return addCommit(commitModel);
+	}
+
+	/**
+	 * Adds a commit to the activity object as long as the commit is not a
+	 * duplicate.
+	 * 
+	 * @param repository
+	 * @param branch
+	 * @param commit
+	 * @return a RepositoryCommit, if one was added. Null if this is duplicate
+	 *         commit
+	 */
+	public RepositoryCommit addCommit(RepositoryCommit commitModel) {
+		if (commits.add(commitModel)) {
+			String author = StringUtils.removeNewlines(commitModel.getAuthorIdent().getName());
+			String authorName = author.toLowerCase();
+			String authorEmail = StringUtils.removeNewlines(commitModel.getAuthorIdent().getEmailAddress()).toLowerCase();
+			if (!repositoryMetrics.containsKey(commitModel.repository)) {
+				repositoryMetrics.put(commitModel.repository, new Metric(commitModel.repository));
+			}
+			repositoryMetrics.get(commitModel.repository).count++;
+
+			if (!authorExclusions.contains(authorName) && !authorExclusions.contains(authorEmail)) {
+				if (!authorMetrics.containsKey(author)) {
+					authorMetrics.put(author, new Metric(author));
+				}
+				authorMetrics.get(author).count++;
+			}
+			return commitModel;
+		}
+		return null;
+	}
+
+	public int getCommitCount() {
+		return commits.size();
+	}
+	
+	public List<RepositoryCommit> getCommits() {
+		List<RepositoryCommit> list = new ArrayList<RepositoryCommit>(commits);
+		Collections.sort(list);
+		return list;
+	}
+
+	public Map<String, Metric> getAuthorMetrics() {
+		return authorMetrics;
+	}
+
+	public Map<String, Metric> getRepositoryMetrics() {
+		return repositoryMetrics;
+	}
+
+	@Override
+	public int compareTo(Activity o) {
+		// reverse chronological order
+		return o.startDate.compareTo(startDate);
+	}
+}

--
Gitblit v1.9.1