From 6477ce2aa8540fedbec7ebba5656cd3968e78019 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 Nov 2011 19:25:49 -0400
Subject: [PATCH] Populate author selector based on repository selector
---
src/com/gitblit/utils/SyndicationUtils.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java
index 2237774..8987c26 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/com/gitblit/utils/SyndicationUtils.java
@@ -24,8 +24,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jgit.revwalk.RevCommit;
-
import com.gitblit.Constants;
import com.gitblit.GitBlitException;
import com.gitblit.models.SyndicatedEntryModel;
@@ -50,19 +48,20 @@
public class SyndicationUtils {
/**
- * Outputs an RSS feed of the list of commits to the outputstream.
+ * Outputs an RSS feed of the list of entries to the outputstream.
*
* @param hostUrl
* @param title
* @param description
* @param repository
- * @param commits
+ * @param entryModels
* @param os
* @throws IOException
* @throws FeedException
*/
public static void toRSS(String hostUrl, String title, String description, String repository,
- List<RevCommit> commits, OutputStream os) throws IOException, FeedException {
+ List<SyndicatedEntryModel> entryModels, OutputStream os) throws IOException,
+ FeedException {
SyndFeed feed = new SyndFeedImpl();
feed.setFeedType("rss_2.0");
@@ -78,17 +77,16 @@
feed.setImage(image);
List<SyndEntry> entries = new ArrayList<SyndEntry>();
- for (RevCommit commit : commits) {
+ for (SyndicatedEntryModel entryModel : entryModels) {
SyndEntry entry = new SyndEntryImpl();
- entry.setTitle(commit.getShortMessage());
- entry.setAuthor(commit.getAuthorIdent().getName());
- entry.setLink(MessageFormat.format("{0}/commit/{1}/{2}", hostUrl,
- StringUtils.encodeURL(repository), commit.getName()));
- entry.setPublishedDate(commit.getCommitterIdent().getWhen());
+ entry.setTitle(entryModel.title);
+ entry.setAuthor(entryModel.author);
+ entry.setLink(entryModel.link);
+ entry.setPublishedDate(entryModel.published);
SyndContent content = new SyndContentImpl();
- content.setType("text/plain");
- content.setValue(commit.getFullMessage());
+ content.setType(entryModel.contentType);
+ content.setValue(entryModel.content);
entry.setDescription(content);
entries.add(entry);
}
@@ -119,27 +117,30 @@
*/
public static List<SyndicatedEntryModel> readFeed(String url, String repository, String branch,
int numberOfEntries, String username, char[] password) throws IOException {
- String feedUrl;
- if (StringUtils.isEmpty(branch)) {
- // no branch specified
- if (numberOfEntries > 0) {
- // fixed number of entries
- feedUrl = MessageFormat.format("{0}/feed/{1}?l={2,number,0}", url, repository);
- } else {
- // server default number of entries
- feedUrl = MessageFormat.format("{0}/feed/{1}", url, repository);
- }
- } else {
- // branch specified
- if (numberOfEntries > 0) {
- // fixed number of entries
- feedUrl = MessageFormat.format("{0}/feed/{1}?h={2}&l={3,number,0}", url,
- repository, branch, numberOfEntries);
- } else {
- // server default number of entries
- feedUrl = MessageFormat.format("{0}/feed/{1}?h={2}", url, repository, branch);
+ // build feed url
+ List<String> parameters = new ArrayList<String>();
+ if (numberOfEntries > 0) {
+ parameters.add("l=" + numberOfEntries);
+ }
+ if (!StringUtils.isEmpty(branch)) {
+ parameters.add("h=" + branch);
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append(MessageFormat.format("{0}" + Constants.SYNDICATION_PATH + "{1}", url, repository));
+ if (parameters.size() > 0) {
+ boolean first = true;
+ for (String parameter : parameters) {
+ if (first) {
+ sb.append('?');
+ first = false;
+ } else {
+ sb.append('&');
+ }
+ sb.append(parameter);
}
}
+ String feedUrl = sb.toString();
+
URLConnection conn = ConnectionUtils.openReadConnection(feedUrl, username, password);
InputStream is = conn.getInputStream();
SyndFeedInput input = new SyndFeedInput();
--
Gitblit v1.9.1