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

do the heavy work outside of the locked method

Browse Source
This commit is contained in:
Athou
2013-05-21 17:00:37 +02:00
parent f93ecd8607
commit e1b8fa4e76
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
View File

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
import com.commafeed.backend.dao.FeedDAO; import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedEntryContent;
import com.commafeed.backend.model.FeedPushInfo; import com.commafeed.backend.model.FeedPushInfo;
import com.commafeed.backend.pubsubhubbub.SubscriptionHandler; import com.commafeed.backend.pubsubhubbub.SubscriptionHandler;
import com.commafeed.backend.services.ApplicationSettingsService; import com.commafeed.backend.services.ApplicationSettingsService;
@@ -39,6 +40,9 @@ public class FeedRefreshUpdater {
@Asynchronous @Asynchronous
public void updateEntries(Feed feed, Collection<FeedEntry> entries) { public void updateEntries(Feed feed, Collection<FeedEntry> entries) {
if (CollectionUtils.isNotEmpty(entries)) { if (CollectionUtils.isNotEmpty(entries)) {
for (FeedEntry entry : entries) {
handleEntry(feed, entry);
}
feedUpdateService.updateEntries(feed, entries); feedUpdateService.updateEntries(feed, entries);
} }
feedDAO.update(feed); feedDAO.update(feed);
@@ -47,6 +51,22 @@ public class FeedRefreshUpdater {
} }
} }
private void handleEntry(Feed feed, FeedEntry entry) {
String baseUri = feed.getLink();
FeedEntryContent content = entry.getContent();
content.setContent(FeedUtils.handleContent(content.getContent(),
baseUri));
String title = FeedUtils.handleContent(content.getTitle(), baseUri);
if (title != null) {
content.setTitle(title.substring(0, Math.min(2048, title.length())));
}
String author = entry.getAuthor();
if (author != null) {
entry.setAuthor(author.substring(0, Math.min(128, author.length())));
}
}
private void handlePubSub(final Feed feed) { private void handlePubSub(final Feed feed) {
FeedPushInfo info = feed.getPushInfo(); FeedPushInfo info = feed.getPushInfo();
if (info != null && info.isActive() == false) { if (info != null && info.isActive() == false) {

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

@@ -19,10 +19,8 @@ import com.commafeed.backend.MetricsBean;
import com.commafeed.backend.dao.FeedEntryDAO; import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedEntryContent;
import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedEntryStatus;
import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.FeedSubscription;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@@ -57,23 +55,6 @@ public class FeedUpdateService {
FeedEntry foundEntry = findEntry(existingEntries, entry); FeedEntry foundEntry = findEntry(existingEntries, entry);
if (foundEntry == null) { if (foundEntry == null) {
String baseUri = feed.getLink();
FeedEntryContent content = entry.getContent();
content.setContent(FeedUtils.handleContent(
content.getContent(), baseUri));
String title = FeedUtils.handleContent(content.getTitle(),
baseUri);
if (title != null) {
content.setTitle(title.substring(0,
Math.min(2048, title.length())));
}
String author = entry.getAuthor();
if (author != null) {
entry.setAuthor(author.substring(0,
Math.min(128, author.length())));
}
entry.setInserted(Calendar.getInstance().getTime()); entry.setInserted(Calendar.getInstance().getTime());
entry.getFeeds().add(feed); entry.getFeeds().add(feed);
entryUpdateList.add(entry); entryUpdateList.add(entry);