From c5147360d8aa005425e38190a154c96eb9eed278 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 20 May 2013 11:45:03 +0200
Subject: [PATCH] sort timestamps desc (#44)

---
 .../backend/feeds/FeedRefreshWorker.java          |  8 +++++---
 .../com/commafeed/backend/feeds/FeedUtils.java    | 15 ++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
index d5892ed6..0928be6a 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
@@ -79,9 +79,10 @@ public class FeedRefreshWorker {
 			fetchedFeed = fetcher.fetch(feed.getUrl(), false,
 					feed.getLastModifiedHeader(), feed.getEtagHeader());
 
-			// stops here if NotModifiedException is thrown
+			// stops here if NotModifiedException or any other exception is
+			// thrown
 			entries = fetchedFeed.getEntries();
-			disabledUntil = FeedUtils.calculateDisabledDate(fetchedFeed);
+			disabledUntil = FeedUtils.buildDisabledUntil(fetchedFeed);
 
 			feed.setLastUpdateSuccess(Calendar.getInstance().getTime());
 			feed.setLink(fetchedFeed.getFeed().getLink());
@@ -105,13 +106,14 @@ public class FeedRefreshWorker {
 			}
 
 			errorCount = feed.getErrorCount() + 1;
-			disabledUntil = FeedUtils.calculateDisabledDate(errorCount);
+			disabledUntil = FeedUtils.buildDisabledUntil(errorCount);
 		}
 
 		feed.setErrorCount(errorCount);
 		feed.setMessage(message);
 		feed.setDisabledUntil(disabledUntil);
 		log.info(feed.getUrl() + " disabledUntil " + disabledUntil);
+
 		feedRefreshUpdater.updateEntries(feed, entries);
 
 	}
diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
index 81685d74..fe483978 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
@@ -112,7 +112,7 @@ public class FeedUtils {
 	 * When there was an error fetching the feed
 	 * 
 	 */
-	public static Date calculateDisabledDate(int errorCount) {
+	public static Date buildDisabledUntil(int errorCount) {
 		Date now = Calendar.getInstance().getTime();
 		int retriesBeforeDisable = 3;
 
@@ -127,7 +127,7 @@ public class FeedUtils {
 	/**
 	 * When the feed was refreshed successfully
 	 */
-	public static Date calculateDisabledDate(FetchedFeed feed) {
+	public static Date buildDisabledUntil(FetchedFeed feed) {
 		Date now = Calendar.getInstance().getTime();
 		Date publishedDate = feed.getPublishedDate();
 
@@ -135,22 +135,22 @@ public class FeedUtils {
 			// older tahn a month, recheck in 24 hours
 			return DateUtils.addHours(now, 24);
 		} else if (publishedDate.before(DateUtils.addDays(now, -14))) {
-			// older than two weekds, recheck in 12 hours
+			// older than two weeks, recheck in 12 hours
 			return DateUtils.addHours(now, 12);
 		} else if (publishedDate.before(DateUtils.addDays(now, -7))) {
 			// older than a week, recheck in 6 hours
 			return DateUtils.addHours(now, 6);
 		} else if (CollectionUtils.isNotEmpty(feed.getEntries())) {
-			//
-			long average = average(feed.getEntries());
+			long average = averageTimeBetweenEntries(feed.getEntries());
 			return new Date(Math.min(DateUtils.addHours(now, 6).getTime(),
 					now.getTime() + average / 3));
 		} else {
-			return null;
+			// no entries in the feed, recheck in 24 hours
+			return DateUtils.addHours(now, 24);
 		}
 	}
 
-	public static long average(List<FeedEntry> entries) {
+	public static long averageTimeBetweenEntries(List<FeedEntry> entries) {
 		List<Long> timestamps = Lists.newArrayList();
 		int i = 0;
 		for (FeedEntry entry : entries) {
@@ -160,6 +160,7 @@ public class FeedUtils {
 				break;
 		}
 		Collections.sort(timestamps);
+		Collections.reverse(timestamps);
 
 		SummaryStatistics stats = new SummaryStatistics();
 		for (i = 0; i < timestamps.size() - 1; i++) {