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

remove potential duplicates

Browse Source
This commit is contained in:
Athou
2013-05-28 12:55:47 +02:00
parent d4f382a512
commit 23c243c8ac
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java
View File

@@ -3,6 +3,7 @@ package com.commafeed.backend.feeds;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Queue; import java.util.Queue;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
@@ -15,6 +16,7 @@ import com.commafeed.backend.MetricsBean;
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.services.ApplicationSettingsService; import com.commafeed.backend.services.ApplicationSettingsService;
import com.google.api.client.util.Maps;
import com.google.common.collect.Queues; import com.google.common.collect.Queues;
@Singleton @Singleton
@@ -56,6 +58,8 @@ public class FeedRefreshTaskGiver {
public synchronized Feed take() { public synchronized Feed take() {
Feed feed = takeQueue.poll(); Feed feed = takeQueue.poll();
if (feed == null) { if (feed == null) {
Date now = Calendar.getInstance().getTime();
int count = 3 * backgroundThreads; int count = 3 * backgroundThreads;
List<Feed> feeds = feedDAO.findNextUpdatable(count); List<Feed> feeds = feedDAO.findNextUpdatable(count);
@@ -64,17 +68,21 @@ public class FeedRefreshTaskGiver {
feeds.add(addQueue.poll()); feeds.add(addQueue.poll());
} }
Map<Long, Feed> map = Maps.newHashMap();
for (Feed f : feeds) { for (Feed f : feeds) {
takeQueue.add(f); f.setLastUpdated(now);
f.setLastUpdated(Calendar.getInstance().getTime()); map.put(f.getId(), f);
} }
takeQueue.addAll(map.values());
size = giveBackQueue.size(); size = giveBackQueue.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
feeds.add(giveBackQueue.poll()); Feed f = giveBackQueue.poll();
f.setLastUpdated(now);
map.put(f.getId(), f);
} }
feedDAO.update(feeds); feedDAO.update(map.values());
feed = takeQueue.poll(); feed = takeQueue.poll();
} }