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

smarter queries for other types

Browse Source
This commit is contained in:
Athou
2013-06-20 18:45:58 +02:00
parent a203246e04
commit 1b37e95336
10 changed files with 283 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/commafeed/frontend/model/Entry.java
View File

@@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import com.commafeed.backend.feeds.FeedUtils;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedEntryStatus;
import com.commafeed.backend.model.FeedSubscription;
import com.sun.syndication.feed.synd.SyndContentImpl;
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndEntryImpl;
@@ -27,28 +28,28 @@ public class Entry implements Serializable {
Entry entry = new Entry();
FeedEntry feedEntry = status.getEntry();
entry.setId(String.valueOf(status.getId()));
FeedSubscription sub = status.getSubscription();
entry.setRead(status.isRead());
entry.setStarred(status.isStarred());
entry.setId(String.valueOf(feedEntry.getId()));
entry.setGuid(feedEntry.getGuid());
entry.setTitle(feedEntry.getContent().getTitle());
entry.setContent(feedEntry.getContent().getContent());
entry.setRtl(FeedUtils.isRTL(feedEntry));
entry.setAuthor(feedEntry.getAuthor());
entry.setEnclosureUrl(status.getEntry().getContent().getEnclosureUrl());
entry.setEnclosureType(status.getEntry().getContent()
.getEnclosureType());
entry.setEnclosureUrl(feedEntry.getContent().getEnclosureUrl());
entry.setEnclosureType(feedEntry.getContent().getEnclosureType());
entry.setDate(feedEntry.getUpdated());
entry.setInsertedDate(feedEntry.getInserted());
entry.setUrl(feedEntry.getUrl());
entry.setRead(status.isRead());
entry.setStarred(status.isStarred());
entry.setFeedName(status.getSubscription().getTitle());
entry.setFeedId(String.valueOf(status.getSubscription().getId()));
entry.setFeedUrl(status.getSubscription().getFeed().getUrl());
entry.setFeedLink(status.getSubscription().getFeed().getLink());
entry.setIconUrl(FeedUtils.getFaviconUrl(status.getSubscription(),
publicUrl));
entry.setFeedName(sub.getTitle());
entry.setFeedId(String.valueOf(sub.getId()));
entry.setFeedUrl(sub.getFeed().getUrl());
entry.setFeedLink(sub.getFeed().getLink());
entry.setIconUrl(FeedUtils.getFaviconUrl(sub, publicUrl));
return entry;
}

13
src/main/java/com/commafeed/frontend/model/request/MarkRequest.java
View File

@@ -15,9 +15,12 @@ import com.wordnik.swagger.annotations.ApiProperty;
@ApiClass("Mark Request")
public class MarkRequest implements Serializable {
@ApiProperty(value = "id", required = true)
@ApiProperty(value = "entry id, category id, 'all' or 'starred'", required = true)
private String id;
@ApiProperty(value = "feed id, only required when marking an entry")
private Long feedId;
@ApiProperty(value = "mark as read or unread")
private boolean read;
@@ -48,4 +51,12 @@ public class MarkRequest implements Serializable {
this.olderThan = olderThan;
}
public Long getFeedId() {
return feedId;
}
public void setFeedId(Long feedId) {
this.feedId = feedId;
}
}

11
src/main/java/com/commafeed/frontend/model/request/StarRequest.java
View File

@@ -18,6 +18,9 @@ public class StarRequest implements Serializable {
@ApiProperty(value = "id", required = true)
private String id;
@ApiProperty(value = "feed id", required = true)
private Long feedId;
@ApiProperty(value = "starred or not")
private boolean starred;
@@ -37,4 +40,12 @@ public class StarRequest implements Serializable {
this.starred = starred;
}
public Long getFeedId() {
return feedId;
}
public void setFeedId(Long feedId) {
this.feedId = feedId;
}
}

4
src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
View File

@@ -49,8 +49,8 @@ public class NextUnreadRedirectPage extends WebPage {
if (category != null) {
List<FeedCategory> children = feedCategoryDAO
.findAllChildrenCategories(user, category);
statuses = feedEntryStatusDAO.findByCategories(children, user,
true, null, 0, 1, ReadingOrder.desc, false);
statuses = feedEntryStatusDAO.findUnreadByCategories(children,
null, 0, 1, ReadingOrder.desc, false);
}
}

16
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -114,11 +114,17 @@ public class CategoryREST extends AbstractResourceREST {
if (feedCategory != null) {
List<FeedCategory> childrenCategories = feedCategoryDAO
.findAllChildrenCategories(getUser(), feedCategory);
List<FeedEntryStatus> unreadEntries = feedEntryStatusDAO
.findByCategories(childrenCategories, getUser(),
unreadOnly, newerThanDate, offset, limit + 1,
order, true);
for (FeedEntryStatus status : unreadEntries) {
List<FeedEntryStatus> list = null;
if (unreadOnly) {
list = feedEntryStatusDAO.findUnreadByCategories(
childrenCategories, newerThanDate, offset,
limit + 1, order, true);
} else {
list = feedEntryStatusDAO.findByCategories(
childrenCategories, newerThanDate, offset,
limit + 1, order, true);
}
for (FeedEntryStatus status : list) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService
.get().getPublicUrl()));

6
src/main/java/com/commafeed/frontend/rest/resources/EntryREST.java
View File

@@ -34,9 +34,10 @@ public class EntryREST extends AbstractResourceREST {
@ApiParam(value = "Mark Request", required = true) MarkRequest req) {
Preconditions.checkNotNull(req);
Preconditions.checkNotNull(req.getId());
Preconditions.checkNotNull(req.getFeedId());
feedEntryService.markEntry(getUser(), Long.valueOf(req.getId()),
req.isRead());
req.getFeedId(), req.isRead());
return Response.ok(Status.OK).build();
}
@@ -48,9 +49,10 @@ public class EntryREST extends AbstractResourceREST {
@ApiParam(value = "Star Request", required = true) StarRequest req) {
Preconditions.checkNotNull(req);
Preconditions.checkNotNull(req.getId());
Preconditions.checkNotNull(req.getFeedId());
feedEntryService.starEntry(getUser(), Long.valueOf(req.getId()),
req.isStarred());
req.getFeedId(), req.isStarred());
return Response.ok(Status.OK).build();
}

37
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -100,10 +100,17 @@ public class FeedREST extends AbstractResourceREST {
entries.setMessage(subscription.getFeed().getMessage());
entries.setErrorCount(subscription.getFeed().getErrorCount());
List<FeedEntryStatus> unreadEntries = feedEntryStatusDAO
.findBySubscription(subscription, unreadOnly,
newerThanDate, offset, limit + 1, order, true);
for (FeedEntryStatus status : unreadEntries) {
List<FeedEntryStatus> list = null;
if (unreadOnly) {
list = feedEntryStatusDAO.findUnreadBySubscription(
subscription, newerThanDate, offset, limit + 1, order,
true);
} else {
list = feedEntryStatusDAO.findBySubscription(subscription,
newerThanDate, offset, limit + 1, order, true);
}
for (FeedEntryStatus status : list) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService.get()
.getPublicUrl()));
@@ -202,16 +209,20 @@ public class FeedREST extends AbstractResourceREST {
@POST
@ApiOperation(value = "Queue a feed for refresh", notes = "Manually add a feed to the refresh queue")
public Response queueForRefresh(@ApiParam(value = "Feed id") IDRequest req) {
Preconditions.checkNotNull(req);
Preconditions.checkNotNull(req.getId());
// TODO evaluate if this is needed
// Preconditions.checkNotNull(req);
// Preconditions.checkNotNull(req.getId());
//
// FeedSubscription sub = feedSubscriptionDAO.findById(getUser(),
// req.getId());
// if (sub != null) {
// taskGiver.add(sub.getFeed());
// return Response.ok(Status.OK).build();
// }
// return Response.ok(Status.NOT_FOUND).build();
FeedSubscription sub = feedSubscriptionDAO.findById(getUser(),
req.getId());
if (sub != null) {
taskGiver.add(sub.getFeed());
return Response.ok(Status.OK).build();
}
return Response.ok(Status.NOT_FOUND).build();
return Response.ok("Disabled for now").build();
}
@Path("/mark")