From 17820f3a1153250a325fed23dfc2da59ce6ba777 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 31 Oct 2011 22:47:21 -0400
Subject: [PATCH] More feeds work in Manager

---
 src/com/gitblit/utils/SyndicationUtils.java |   99 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java
index 80a1b28..2237774 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/com/gitblit/utils/SyndicationUtils.java
@@ -16,8 +16,10 @@
 package com.gitblit.utils;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.net.URLConnection;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +27,8 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 
 import com.gitblit.Constants;
+import com.gitblit.GitBlitException;
+import com.gitblit.models.SyndicatedEntryModel;
 import com.sun.syndication.feed.synd.SyndContent;
 import com.sun.syndication.feed.synd.SyndContentImpl;
 import com.sun.syndication.feed.synd.SyndEntry;
@@ -33,15 +37,36 @@
 import com.sun.syndication.feed.synd.SyndFeedImpl;
 import com.sun.syndication.feed.synd.SyndImageImpl;
 import com.sun.syndication.io.FeedException;
+import com.sun.syndication.io.SyndFeedInput;
 import com.sun.syndication.io.SyndFeedOutput;
+import com.sun.syndication.io.XmlReader;
 
+/**
+ * Utility class for RSS feeds.
+ * 
+ * @author James Moger
+ * 
+ */
 public class SyndicationUtils {
 
+	/**
+	 * Outputs an RSS feed of the list of commits to the outputstream.
+	 * 
+	 * @param hostUrl
+	 * @param title
+	 * @param description
+	 * @param repository
+	 * @param commits
+	 * @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 {
 
 		SyndFeed feed = new SyndFeedImpl();
 		feed.setFeedType("rss_2.0");
+		feed.setEncoding("UTF-8");
 		feed.setTitle(title);
 		feed.setLink(MessageFormat.format("{0}/summary/{1}", hostUrl,
 				StringUtils.encodeURL(repository)));
@@ -62,17 +87,83 @@
 			entry.setPublishedDate(commit.getCommitterIdent().getWhen());
 
 			SyndContent content = new SyndContentImpl();
-			content.setType("text/html");
-			String html = StringUtils.escapeForHtml(commit.getFullMessage(), false);
-			content.setValue(StringUtils.breakLinesForHtml(html));
+			content.setType("text/plain");
+			content.setValue(commit.getFullMessage());
 			entry.setDescription(content);
 			entries.add(entry);
 		}
 		feed.setEntries(entries);
 
-		OutputStreamWriter writer = new OutputStreamWriter(os);
+		OutputStreamWriter writer = new OutputStreamWriter(os, "UTF-8");
 		SyndFeedOutput output = new SyndFeedOutput();
 		output.output(feed, writer);
 		writer.close();
 	}
+
+	/**
+	 * Reads a Gitblit RSS feed.
+	 * 
+	 * @param url
+	 *            the url of the Gitblit server
+	 * @param repository
+	 *            the repository name
+	 * @param branch
+	 *            the branch name (optional)
+	 * @param numberOfEntries
+	 *            the number of entries to retrieve. if <= 0 the server default
+	 *            is used.
+	 * @param username
+	 * @param password
+	 * @return a list of SyndicationModel entries
+	 * @throws {@link IOException}
+	 */
+	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);
+			}
+		}
+		URLConnection conn = ConnectionUtils.openReadConnection(feedUrl, username, password);
+		InputStream is = conn.getInputStream();
+		SyndFeedInput input = new SyndFeedInput();
+		SyndFeed feed = null;
+		try {
+			feed = input.build(new XmlReader(is));
+		} catch (FeedException f) {
+			throw new GitBlitException(f);
+		}
+		is.close();
+		List<SyndicatedEntryModel> entries = new ArrayList<SyndicatedEntryModel>();
+		for (Object o : feed.getEntries()) {
+			SyndEntryImpl entry = (SyndEntryImpl) o;
+			SyndicatedEntryModel model = new SyndicatedEntryModel();
+			model.repository = repository;
+			model.branch = branch;
+			model.title = entry.getTitle();
+			model.author = entry.getAuthor();
+			model.published = entry.getPublishedDate();
+			model.link = entry.getLink();
+			model.content = entry.getDescription().getValue();
+			model.contentType = entry.getDescription().getType();
+			entries.add(model);
+		}
+		return entries;
+	}
 }

--
Gitblit v1.9.1