# HG changeset patch
# User dirk
# Date 1315716674 -7200
# Node ID ac1de0a467fdbb9a45b46bb74392f80f6ef0aeb4
# Parent  964661153b97711100de44003babf7061c3c813b
clean up

diff -r 964661153b97 -r ac1de0a467fd backend/couchdb/CouchDbBackend.py
--- a/backend/couchdb/CouchDbBackend.py	Sat Sep 10 09:15:25 2011 +0200
+++ b/backend/couchdb/CouchDbBackend.py	Sun Sep 11 06:51:14 2011 +0200
@@ -52,13 +52,12 @@
         return feedsWithUnreadEntries
 
     def _retrieveEntriesForSelectedFeed(self, hideReadEntries):
-        viewResults = FeedEntry.view(self.database, CouchDb.feedEntriesByFeed(),
-            key=self.selectedFeed.id)
-        viewResults = list(viewResults)
+        viewResults = FeedEntry.entriesForFeed(self.selectedFeed, self.database)
         # TODO update date is a string ... convert to a ListDateTimeField for better sort support
         viewResults.sort(FeedEntry.compareByUpdateDate, reverse=True)
         if hideReadEntries:
-            viewResults = filter(lambda feedEntry: feedEntry.read == False, viewResults)
+            filterFunc = lambda feedEntry: feedEntry.read == False
+            viewResults = filter(filterFunc, viewResults)
         return viewResults
 
     def markSelectedFeedAsRead(self):
diff -r 964661153b97 -r ac1de0a467fd backend/couchdb/FeedEntry.py
--- a/backend/couchdb/FeedEntry.py	Sat Sep 10 09:15:25 2011 +0200
+++ b/backend/couchdb/FeedEntry.py	Sun Sep 11 06:51:14 2011 +0200
@@ -32,6 +32,11 @@
     def compareByUpdateDate(first, second):
         return cmp(first, second)
 
+    @staticmethod
+    def entriesForFeed(feed, database):
+        viewResults = FeedEntry.view(database, CouchDb.feedEntriesByFeed(), key=feed.id)
+        return list(viewResults)
+
     def markRead(self, database):
         self.read = True
         self.store(database)