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

faster existing entry detection

Browse Source
This commit is contained in:
Athou
2013-06-23 15:14:14 +02:00
parent 65ce971267
commit 8936a0c784
3 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/commafeed/backend/services/FeedUpdateService.java
View File

@@ -6,10 +6,9 @@ import java.util.List;
import javax.ejb.Stateless;
import javax.inject.Inject;
import org.hibernate.Hibernate;
import com.commafeed.backend.MetricsBean;
import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryDAO.EntryWithFeed;
import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.feeds.FeedUtils;
@@ -38,11 +37,11 @@ public class FeedUpdateService {
public void updateEntry(Feed feed, FeedEntry entry,
List<FeedSubscription> subscriptions) {
FeedEntry foundEntry = FeedUtils.findEntry(
feedEntryDAO.findByGuid(entry.getGuid()), entry);
EntryWithFeed existing = feedEntryDAO.findExisting(entry.getGuid(),
entry.getUrl(), feed.getId());
FeedEntry update = null;
if (foundEntry == null) {
if (existing == null) {
FeedEntryContent content = entry.getContent();
content.setTitle(FeedUtils.truncate(
FeedUtils.handleContent(content.getTitle(), feed.getLink()),
@@ -54,12 +53,9 @@ public class FeedUpdateService {
entry.getFeeds().add(feed);
update = entry;
} else {
Hibernate.initialize(foundEntry.getFeeds());
if (FeedUtils.findFeed(foundEntry.getFeeds(), feed) == null) {
foundEntry.getFeeds().add(feed);
update = foundEntry;
}
} else if (existing.feed == null) {
existing.entry.getFeeds().add(feed);
update = existing.entry;
}
if (update != null) {