Added a Dashboard page with a daily ref log of starred/owned repos

This is a work-in-progress and is mostly working like I want, but will require
some refactoring to make it even more useful and less complex.

Author: gitblit

NOTICE

@@ -261,4 +261,12 @@ Iconic
    Iconic, release under the
    Creative Commons Share Alike 3.0 License.
 
-   http://somerandomdude.com/work/iconic
+   http://somerandomdude.com/work/iconic
+   
+---------------------------------------------------------------------------
+AngularJS
+---------------------------------------------------------------------------
+   AngularJS, release under the
+   MIT License.
+   
+   http://angularjs.org/   

releases.moxie

@@ -40,6 +40,7 @@ r17: {
 
     additions: 
      - Added simple star/unstar function to flag or bookmark interesting repositories
+     - Added Dashboard page which shows a news feed for starred repositories and offers a filterable list of repositories you care about
 	 - Added a ui for the push log introduced in 1.2.1 (issue-177)
 	 - Added client application menus for Git, SourceTree, Tower, GitHub for Windows, GitHub for Mac, and SparkleShare
 	 - Added GO http/https connector thread pool size setting
@@ -88,6 +89,7 @@ r17: {
 	dependencyChanges:
 	- JGit 3.0.0-SNAPSHOT
 	- Iconic font
+	- AngularJS 1.0.7
 
 	settings:
 	- { name: 'git.daemonBindInterface', defaultValue: 'localhost' }

src/main/java/com/gitblit/models/DailyLogEntry.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013 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.Date;
+
+import org.eclipse.jgit.lib.PersonIdent;
+
+/**
+ * Model class to simulate a push for presentation in the push log news feed
+ * for a repository that does not have a Gitblit push log.  Commits are grouped
+ * by date and may be additionally split by ref.
+ * 
+ * @author James Moger
+ */
+public class DailyLogEntry extends PushLogEntry implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public DailyLogEntry(String repository, Date date) {
+		super(repository, date, new UserModel("digest"));
+	}
+
+	public DailyLogEntry(String repository, Date date, UserModel user) {
+		super(repository, date, user);
+	}
+
+	@Override
+	public PersonIdent getCommitterIdent() {
+		if (getAuthorCount() == 1) {
+			return getCommits().get(0).getCommitterIdent();
+		}
+		
+		return super.getCommitterIdent();
+	}
+
+	@Override
+	public PersonIdent getAuthorIdent() {
+		if (getAuthorCount() == 1) {
+			return getCommits().get(0).getAuthorIdent();
+		}
+		
+		return super.getAuthorIdent();
+	}
+}

src/main/java/com/gitblit/models/PushLogEntry.java

@@ -54,6 +54,8 @@ public class PushLogEntry implements Serializable, Comparable<PushLogEntry> {
 	private final Map<String, ReceiveCommand.Type> refUpdates;
 
 	private final Map<String, String> refIdChanges;
+	
+	private int authorCount;
 
 	/**
 	 * Constructor for specified duration of push from start date.
@@ -72,6 +74,7 @@ public PushLogEntry(String repository, Date date, UserModel user) {
 		this.commits = new LinkedHashSet<RepositoryCommit>();
 		this.refUpdates = new HashMap<String, ReceiveCommand.Type>();
 		this.refIdChanges = new HashMap<String, String>();
+		this.authorCount = -1;
 	}
 
 	/**
@@ -152,6 +155,7 @@ public ReceiveCommand.Type getChangeType(String ref) {
 	public RepositoryCommit addCommit(String branch, RevCommit commit) {
 		RepositoryCommit commitModel = new RepositoryCommit(repository, branch, commit);
 		if (commits.add(commitModel)) {
+			authorCount = -1;
 			return commitModel;
 		}
 		return null;
@@ -165,6 +169,7 @@ public RepositoryCommit addCommit(String branch, RevCommit commit) {
 	 */
 	public void addCommits(List<RepositoryCommit> list) {
 		commits.addAll(list);
+		authorCount = -1;
 	}
 
 	/**
@@ -254,6 +259,18 @@ protected List<String> getChangedRefs(String baseRef) {
 		return list;
 	}
 
+	public int getAuthorCount() {
+		if (authorCount == -1) {
+			Set<String> authors = new HashSet<String>();
+			for (RepositoryCommit commit : commits) {
+				String name = commit.getAuthorIdent().getName();
+				authors.add(name);
+			}
+			authorCount = authors.size();
+		}
+		return authorCount;
+	}
+	
 	/**
 	 * The total number of commits in the push.
 	 * 

src/main/java/com/gitblit/utils/PushLogUtils.java

@@ -16,8 +16,11 @@
 package com.gitblit.utils;
 
 import java.io.IOException;
+import java.text.DateFormat;
 import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -50,6 +53,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.gitblit.models.DailyLogEntry;
 import com.gitblit.models.PathModel.PathChangeModel;
 import com.gitblit.models.PushLogEntry;
 import com.gitblit.models.RefModel;
@@ -109,6 +113,25 @@ public static RefModel getPushLogBranch(Repository repository) {
 		return null;
 	}
 
+	private static UserModel newUserModelFrom(PersonIdent ident) {
+		String name = ident.getName();
+		String username;
+		String displayname;
+		if (name.indexOf('/') > -1) {
+			int slash = name.indexOf('/');
+			displayname = name.substring(0, slash);
+			username = name.substring(slash + 1);
+		} else {
+			displayname = name;
+			username = ident.getEmailAddress();
+		}
+		
+		UserModel user = new UserModel(username);
+		user.displayName = displayname;
+		user.emailAddress = ident.getEmailAddress();
+		return user;
+	}
+	
 	/**
 	 * Updates a push log.
 	 * 
@@ -135,9 +158,15 @@ public static boolean updatePushLog(UserModel user, Repository repository,
 				DirCache index = createIndex(repository, headId, commands);
 				ObjectId indexTreeId = index.writeTree(odi);
 
-				PersonIdent ident = 
-						new PersonIdent(MessageFormat.format("{0}/{1}", user.getDisplayName(), user.username),
+				PersonIdent ident;
+				if (UserModel.ANONYMOUS.equals(user)) {
+					// anonymous push
+					ident = new PersonIdent("anonymous", "anonymous");
+				} else {
+					// construct real pushing account
+					ident =	new PersonIdent(MessageFormat.format("{0}/{1}", user.getDisplayName(), user.username),
 						user.emailAddress == null ? user.username : user.emailAddress);
+				}
 
 				// Create a commit object
 				CommitBuilder commit = new CommitBuilder();
@@ -339,23 +368,9 @@ public static List<PushLogEntry> getPushLog(String repositoryName, Repository re
 				continue;
 			}
 
-			String name = push.getAuthorIdent().getName();
-			String username;
-			String displayname;
-			if (name.indexOf('/') > -1) {
-				int slash = name.indexOf('/');
-				displayname = name.substring(0, slash);
-				username = name.substring(slash + 1);
-			} else {
-				displayname = name;
-				username = push.getAuthorIdent().getEmailAddress();
-			}
-			
-			UserModel user = new UserModel(username);
-			user.displayName = displayname;
-			user.emailAddress = push.getAuthorIdent().getEmailAddress();
-			
+			UserModel user = newUserModelFrom(push.getAuthorIdent());
 			Date date = push.getAuthorIdent().getWhen();
+			
 			PushLogEntry log = new PushLogEntry(repositoryName, date, user);
 			list.add(log);
 			List<PathChangeModel> changedRefs = JGitUtils.getFilesInCommit(repository, push);
@@ -413,14 +428,22 @@ public static List<PushLogEntry> getPushLogByRef(String repositoryName, Reposito
 			int maxCount) {
 		// break the push log into ref push logs and then merge them back into a list
 		Map<String, List<PushLogEntry>> refMap = new HashMap<String, List<PushLogEntry>>();
-		for (PushLogEntry push : getPushLog(repositoryName, repository, offset, maxCount)) {
+        List<PushLogEntry> pushes = getPushLog(repositoryName, repository, offset, maxCount);
+		for (PushLogEntry push : pushes) {
 			for (String ref : push.getChangedRefs()) {
 				if (!refMap.containsKey(ref)) {
 					refMap.put(ref, new ArrayList<PushLogEntry>());
 				}
 
 				// construct new ref-specific push log entry
-				PushLogEntry refPush = new PushLogEntry(push.repository, push.date, push.user);
+				PushLogEntry refPush;
+				if (push instanceof DailyLogEntry) {
+					// simulated push log from commits grouped by date
+					refPush = new DailyLogEntry(push.repository, push.date);
+				} else {
+					// real push log entry
+					refPush = new PushLogEntry(push.repository, push.date, push.user);
+				}
 				refPush.updateRef(ref, push.getChangeType(ref), push.getOldId(ref), push.getNewId(ref));
 				refPush.addCommits(push.getCommits(ref));
 				refMap.get(ref).add(refPush);
@@ -451,15 +474,16 @@ public static List<PushLogEntry> getPushLogByRef(String repositoryName, Reposito
 	public static List<PushLogEntry> getPushLogByRef(String repositoryName, Repository repository,  Date minimumDate) {
 		// break the push log into ref push logs and then merge them back into a list
 		Map<String, List<PushLogEntry>> refMap = new HashMap<String, List<PushLogEntry>>();
-		for (PushLogEntry push : getPushLog(repositoryName, repository, minimumDate)) {
+		List<PushLogEntry> pushes = getPushLog(repositoryName, repository, minimumDate);
+		for (PushLogEntry push : pushes) {
 			for (String ref : push.getChangedRefs()) {
 				if (!refMap.containsKey(ref)) {
 					refMap.put(ref, new ArrayList<PushLogEntry>());
 				}
-				
-				// construct new ref-specific push log entry
-				PushLogEntry refPush = new PushLogEntry(push.repository, push.date, push.user);
-				refPush.updateRef(ref, push.getChangeType(ref), push.getOldId(ref), push.getNewId(ref));
+
+                // construct new ref-specific push log entry
+                PushLogEntry refPush = new PushLogEntry(push.repository, push.date, push.user);
+                refPush.updateRef(ref, push.getChangeType(ref), push.getOldId(ref), push.getNewId(ref));
 				refPush.addCommits(push.getCommits(ref));
 				refMap.get(ref).add(refPush);
 			}
@@ -476,4 +500,106 @@ public static List<PushLogEntry> getPushLogByRef(String repositoryName, Reposito
 
 		return refPushLog;
 	}
+
+    /**
+     * Returns a commit log grouped by day.
+     *
+     * @param repositoryName
+     * @param repository
+     * @param minimumDate
+     * @param offset
+     * @param maxCount
+     * 			if < 0, all pushes are returned.
+     * @return a list of grouped commit log entries
+     */
+    public static List<DailyLogEntry> getDailyLog(String repositoryName, Repository repository,
+                                                 Date minimumDate, int offset, int maxCount) {
+
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//		df.setTimeZone(timezone);
+
+        Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository);
+        Map<String, DailyLogEntry> tags = new HashMap<String, DailyLogEntry>();
+        Map<String, DailyLogEntry> dailydigests = new HashMap<String, DailyLogEntry>();
+        for (RefModel local : JGitUtils.getLocalBranches(repository, true, -1)) {
+            String branch = local.getName();
+            List<RevCommit> commits = JGitUtils.getRevLog(repository, branch, minimumDate);
+            for (RevCommit commit : commits) {
+                Date date = JGitUtils.getCommitDate(commit);
+                String dateStr = df.format(date);
+                if (!dailydigests.containsKey(dateStr)) {
+                    dailydigests.put(dateStr, new DailyLogEntry(repositoryName, date));
+                }
+                PushLogEntry digest = dailydigests.get(dateStr);
+                digest.updateRef(branch, ReceiveCommand.Type.UPDATE, commit.getParents()[0].getId().getName(), commit.getName());
+                RepositoryCommit repoCommit = digest.addCommit(branch, commit);
+                if (repoCommit != null) {
+                    repoCommit.setRefs(allRefs.get(commit.getId()));
+                    if (!ArrayUtils.isEmpty(repoCommit.getRefs())) {
+                        // treat tags as special events in the log
+                        for (RefModel ref : repoCommit.getRefs()) {
+                            if (ref.getName().startsWith(Constants.R_TAGS)) {
+                                if (!tags.containsKey(dateStr)) {
+                        			UserModel tagUser = newUserModelFrom(commit.getAuthorIdent());
+                        			Date tagDate = commit.getAuthorIdent().getWhen();
+                                    tags.put(dateStr, new DailyLogEntry(repositoryName, tagDate, tagUser));
+                                }
+                                PushLogEntry tagEntry = tags.get(dateStr);
+                                tagEntry.updateRef(ref.getName(), ReceiveCommand.Type.CREATE);
+                                tagEntry.addCommits(Arrays.asList(repoCommit));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        List<DailyLogEntry> list = new ArrayList<DailyLogEntry>(dailydigests.values());
+        list.addAll(tags.values());
+        Collections.sort(list);
+        return list;
+    }
+
+    /**
+     * Returns the list of commits separated by ref (e.g. each ref has it's own
+     * PushLogEntry object for each day).
+     *
+     * @param repositoryName
+     * @param repository
+     * @param minimumDate
+     * @return a list of push log entries separated by ref and date
+     */
+    public static List<DailyLogEntry> getDailyLogByRef(String repositoryName, Repository repository,  Date minimumDate) {
+        // break the push log into ref push logs and then merge them back into a list
+        Map<String, List<DailyLogEntry>> refMap = new HashMap<String, List<DailyLogEntry>>();
+        List<DailyLogEntry> pushes = getDailyLog(repositoryName, repository, minimumDate, 0, -1);
+        for (DailyLogEntry push : pushes) {
+            for (String ref : push.getChangedRefs()) {
+                if (!refMap.containsKey(ref)) {
+                    refMap.put(ref, new ArrayList<DailyLogEntry>());
+                }
+
+                // construct new ref-specific push log entry
+                DailyLogEntry refPush = new DailyLogEntry(push.repository, push.date, push.user);
+                refPush.updateRef(ref, push.getChangeType(ref), push.getOldId(ref), push.getNewId(ref));
+                refPush.addCommits(push.getCommits(ref));
+                refMap.get(ref).add(refPush);
+            }
+        }
+
+        // merge individual ref pushes into master list
+        List<DailyLogEntry> refPushLog = new ArrayList<DailyLogEntry>();
+        for (List<DailyLogEntry> refPush : refMap.values()) {
+        	for (DailyLogEntry entry : refPush) {
+        		if (entry.getCommitCount() > 0) {
+        			refPushLog.add(entry);
+        		}
+        	}
+        }
+
+        // sort ref push log
+        Collections.sort(refPushLog);
+
+        return refPushLog;
+    }
 }