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

resolve feeds from database

Browse Source
This commit is contained in:
Athou
2013-07-09 08:18:16 +02:00
parent 32fb22d503
commit a7a0949436
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/commafeed/backend/DatabaseCleaner.java
View File

@@ -15,6 +15,7 @@ import com.commafeed.backend.dao.FeedEntryDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.FeedSubscription;
import com.google.common.collect.Lists;
public class DatabaseCleaner { public class DatabaseCleaner {
@@ -77,7 +78,12 @@ public class DatabaseCleaner {
List<FeedCount> fcs = feedDAO.findDuplicates(0, 10, 1); List<FeedCount> fcs = feedDAO.findDuplicates(0, 10, 1);
deleted = fcs.size(); deleted = fcs.size();
for (FeedCount fc : fcs) { for (FeedCount fc : fcs) {
mergeFeeds(fc.feeds.get(0), fc.feeds); Feed into = feedDAO.findById(fc.feeds.get(0).getId());
List<Feed> feeds = Lists.newArrayList();
for (Feed feed : fc.feeds) {
feeds.add(feedDAO.findById(feed.getId()));
}
mergeFeeds(into, feeds);
} }
total += deleted; total += deleted;
log.info("merged {} feeds", total); log.info("merged {} feeds", total);