garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

use entry date if more recent than feed published date

Browse Source
This commit is contained in:
Athou
2013-06-08 22:31:34 +02:00
parent 517b92c35c
commit 3572c0344e
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,6 @@ public class FeedParser {
fetchedFeed.setTopic(findSelf(rss)); fetchedFeed.setTopic(findSelf(rss));
feed.setUrl(feedUrl); feed.setUrl(feedUrl);
feed.setLink(rss.getLink()); feed.setLink(rss.getLink());
feed.setLastPublishedDate(validateDate(rss.getPublishedDate()));
List<SyndEntry> items = rss.getEntries(); List<SyndEntry> items = rss.getEntries();
for (SyndEntry item : items) { for (SyndEntry item : items) {
FeedEntry entry = new FeedEntry(); FeedEntry entry = new FeedEntry();
@@ -90,7 +89,7 @@ public class FeedParser {
entry.setUrl(FeedUtils.truncate( entry.setUrl(FeedUtils.truncate(
FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink()), FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink()),
2048)); 2048));
entry.setUpdated(validateDate(getUpdateDate(item))); entry.setUpdated(validateDate(getEntryUpdateDate(item)));
entry.setAuthor(FeedUtils.truncate(item.getAuthor(), 128)); entry.setAuthor(FeedUtils.truncate(item.getAuthor(), 128));
FeedEntryContent content = new FeedEntryContent(); FeedEntryContent content = new FeedEntryContent();
@@ -108,9 +107,15 @@ public class FeedParser {
entries.add(entry); entries.add(entry);
} }
Date lastEntryDate = null; Date lastEntryDate = null;
if (!entries.isEmpty()) { if (!entries.isEmpty()) {
Long timestamp = FeedUtils.getSortedTimestamps(entries).get(0); List<Long> sortedTimestamps = FeedUtils
.getSortedTimestamps(entries);
Long timestamp = sortedTimestamps.get(0);
lastEntryDate = new Date(timestamp); lastEntryDate = new Date(timestamp);
feed.setLastPublishedDate(getFeedPublishedDate(
validateDate(rss.getPublishedDate()), entries));
} }
fetchedFeed.setLastEntryDate(lastEntryDate); fetchedFeed.setLastEntryDate(lastEntryDate);
@@ -146,10 +151,19 @@ public class FeedParser {
} }
} }
} }
} }
private Date getUpdateDate(SyndEntry item) { private Date getFeedPublishedDate(Date publishedDate,
List<FeedEntry> entries) {
for (FeedEntry entry : entries) {
if (entry.getUpdated().getTime() > publishedDate.getTime()) {
publishedDate = entry.getUpdated();
}
}
return publishedDate;
}
private Date getEntryUpdateDate(SyndEntry item) {
Date date = item.getUpdatedDate(); Date date = item.getUpdatedDate();
if (date == null) { if (date == null) {
date = item.getPublishedDate(); date = item.getPublishedDate();