From 145285dd206a498f0682f281399a2cbe27ea03bd Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 29 May 2013 16:42:45 +0200
Subject: [PATCH] handle entry content only if the entry is new

---
 .../java/com/commafeed/backend/feeds/FeedParser.java     | 6 ++----
 .../commafeed/backend/services/FeedUpdateService.java    | 9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index 86574052..2a7d0c6f 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -91,10 +91,8 @@ public class FeedParser {
 				entry.setAuthor(FeedUtils.truncate(item.getAuthor(), 128));
 
 				FeedEntryContent content = new FeedEntryContent();
-				content.setContent(FeedUtils.handleContent(getContent(item),
-						feed.getLink()));
-				content.setTitle(FeedUtils.truncate(FeedUtils.handleContent(
-						item.getTitle(), feed.getLink()), 2048));
+				content.setContent(getContent(item));
+				content.setTitle(item.getTitle());
 				SyndEnclosure enclosure = (SyndEnclosure) Iterables.getFirst(
 						item.getEnclosures(), null);
 				if (enclosure != null) {
diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
index 0a47c815..3d639c56 100644
--- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
@@ -14,8 +14,10 @@ import com.commafeed.backend.MetricsBean;
 import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.FeedSubscriptionDAO;
+import com.commafeed.backend.feeds.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
+import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.FeedEntryStatus;
 import com.commafeed.backend.model.FeedSubscription;
 import com.google.common.collect.Lists;
@@ -43,6 +45,13 @@ public class FeedUpdateService {
 
 		FeedEntry update = null;
 		if (foundEntry == null) {
+			FeedEntryContent content = entry.getContent();
+			content.setTitle(FeedUtils.truncate(
+					FeedUtils.handleContent(content.getTitle(), feed.getLink()),
+					2048));
+			content.setContent(FeedUtils.handleContent(content.getContent(),
+					feed.getLink()));
+
 			entry.setInserted(Calendar.getInstance().getTime());
 			entry.getFeeds().add(feed);