Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

build disabledUntil date for feeds with support for http 304

Browse Source
This commit is contained in:
Athou
2013-05-24 12:01:00 +02:00
parent f5cae4743e
commit d148fa9df7
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/commafeed/backend/feeds/FeedUtils.java
View File

@@ -134,9 +134,9 @@ public class FeedUtils {
/**
* When the feed was refreshed successfully
*/
public static Date buildDisabledUntil(FetchedFeed feed) {
public static Date buildDisabledUntil(Date publishedDate,
List<FeedEntry> entries) {
Date now = Calendar.getInstance().getTime();
Date publishedDate = feed.getPublishedDate();
if (publishedDate == null) {
// feed with no entries, recheck in 24 hours
@@ -150,9 +150,9 @@ public class FeedUtils {
} 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())) {
} else if (CollectionUtils.isNotEmpty(entries)) {
// use average time between entries to decide when to refresh next
long average = averageTimeBetweenEntries(feed.getEntries());
long average = averageTimeBetweenEntries(entries);
return new Date(Math.min(DateUtils.addHours(now, 6).getTime(),
now.getTime() + average / 3));
} else {