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

propagate exception message

Browse Source
This commit is contained in:
Athou
2013-07-03 07:56:52 +02:00
parent 4565a7c43f
commit e759d095ed
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/commafeed/backend/feeds/FeedParser.java
View File

@@ -93,7 +93,7 @@ public class FeedParser {
entry.setUrl(FeedUtils.truncate(
FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink()),
2048));
entry.setUpdated(validateDate(getEntryUpdateDate(item)));
entry.setUpdated(validateDate(getEntryUpdateDate(item), true));
entry.setAuthor(item.getAuthor());
FeedEntryContent content = new FeedEntryContent();
@@ -111,7 +111,7 @@ public class FeedParser {
entries.add(entry);
}
Date lastEntryDate = null;
Date publishedDate = validateDate(rss.getPublishedDate());
Date publishedDate = validateDate(rss.getPublishedDate(), false);
if (!entries.isEmpty()) {
List<Long> sortedTimestamps = FeedUtils
.getSortedTimestamps(entries);
@@ -119,7 +119,7 @@ public class FeedParser {
lastEntryDate = new Date(timestamp);
publishedDate = getFeedPublishedDate(publishedDate, entries);
}
feed.setLastPublishedDate(publishedDate);
feed.setLastPublishedDate(validateDate(publishedDate, true));
feed.setAverageEntryInterval(FeedUtils
.averageTimeBetweenEntries(entries));
feed.setLastEntryDate(lastEntryDate);
@@ -160,12 +160,9 @@ public class FeedParser {
private Date getFeedPublishedDate(Date publishedDate,
List<FeedEntry> entries) {
if (publishedDate == null) {
return null;
}
for (FeedEntry entry : entries) {
if (entry.getUpdated().getTime() > publishedDate.getTime()) {
if (publishedDate == null || entry.getUpdated().getTime() > publishedDate.getTime()) {
publishedDate = entry.getUpdated();
}
}
@@ -183,10 +180,10 @@ public class FeedParser {
return date;
}
private Date validateDate(Date date) {
private Date validateDate(Date date, boolean nullToNow) {
Date now = new Date();
if (date == null) {
return now;
return nullToNow ? now : null;
}
if (date.before(START) || date.after(END)) {
return now;