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

better background refresh

Browse Source
This commit is contained in:
Athou
2013-04-11 19:11:27 +02:00
parent 70b6fd1fd3
commit 4b49625a8f
5 changed files with 238 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/commafeed/backend/dao/FeedService.java
View File

@@ -1,10 +1,19 @@
package com.commafeed.backend.dao;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.time.DateUtils;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.Feed_;
import com.commafeed.frontend.utils.ModelFactory.MF;
import com.google.common.collect.Iterables;
import com.uaihebert.model.EasyCriteria;
@@ -14,10 +23,32 @@ import com.uaihebert.model.EasyCriteria;
public class FeedService extends GenericDAO<Feed> {
public List<Feed> findNextUpdatable(int count) {
EasyCriteria<Feed> criteria = createCriteria();
criteria.orderByAsc(MF.i(proxy().getLastUpdated()));
criteria.setMaxResults(count);
return criteria.getResultList();
CriteriaQuery<Feed> query = builder.createQuery(getType());
Root<Feed> root = query.from(getType());
Date now = Calendar.getInstance().getTime();
Predicate hasSubscriptions = builder.isNotEmpty(root
.get(Feed_.subscriptions));
Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated));
Predicate updatedMoreThanOneMinuteAgo = builder.lessThan(
root.get(Feed_.lastUpdated), DateUtils.addMinutes(now, -1));
Predicate disabledDateIsNull = builder.isNull(root
.get(Feed_.disabledUntil));
Predicate DisabledDateIsInPast = builder.lessThan(
root.get(Feed_.disabledUntil), now);
query.where(hasSubscriptions,
builder.or(neverUpdated, updatedMoreThanOneMinuteAgo),
builder.or(disabledDateIsNull, DisabledDateIsInPast));
query.orderBy(builder.asc(root.get(Feed_.lastUpdated)));
TypedQuery<Feed> q = em.createQuery(query);
q.setMaxResults(count);
return q.getResultList();
}
public Feed findByUrl(String url) {
@@ -29,7 +60,7 @@ public class FeedService extends GenericDAO<Feed> {
EasyCriteria<Feed> criteria = createCriteria();
criteria.andEquals(MF.i(proxy().getId()), feedId);
criteria.leftJoinFetch(MF.i(proxy().getEntries()));
criteria.setFirstResult(offset);
criteria.setMaxResults(limit);
return criteria.getSingleResult();