# HG changeset patch
# User dirk
# Date 1367641400 -7200
# Node ID b0de75d57e78ddc2a9c874babaf85557f25e5223
# Parent  524cbf9e413c87c9439e6e6514e284fd54237b38# Parent  1ac0b8e2feae3bd8336dded8247ae201b13d9ca1
Merge with 1ac0b8e2feae3bd8336dded8247ae201b13d9ca1

diff -r 1ac0b8e2feae -r b0de75d57e78 MainWindow.py
--- a/MainWindow.py	Mon Nov 12 08:10:40 2012 +0100
+++ b/MainWindow.py	Sat May 04 06:23:20 2013 +0200
@@ -88,7 +88,7 @@
         self.openSelectedEntryInBrowser()
 
     def openSummaryFromSelectedEntry(self):
-        # TODO this is the wrong base url, figure out the correct one
+        # TODO: this is the wrong base url, figure out the correct one
         feedEntry = self.backend.selectedFeedEntry
         baseUrl = QUrl(feedEntry.link)
         self.ui.webView.setHtml(feedEntry.summary, baseUrl)
@@ -111,7 +111,7 @@
         feedEntry = self.backend.selectedFeedEntry
         message = "Open %s in external browser" % (feedEntry.title)
         self._updateStatusBar(message)
-        # TODO make browser configurable
+        # TODO: make browser configurable
         browser = "/usr/local/bin/opera"
         subprocess.Popen([browser, feedEntry.link])
 
diff -r 1ac0b8e2feae -r b0de75d57e78 backend/AbstractFeedUpdater.py
--- a/backend/AbstractFeedUpdater.py	Mon Nov 12 08:10:40 2012 +0100
+++ b/backend/AbstractFeedUpdater.py	Sat May 04 06:23:20 2013 +0200
@@ -64,7 +64,7 @@
 
     def _normalizeUpdatedDate(self, entry):
         if not hasattr(entry, "updated_parsed") or entry.updated_parsed is None:
-            # TODO try to parse the entry.updated date string
+            # TODO: try to parse the entry.updated date string
             entry.updated_parsed = datetime.today()
         else:
             entry.updated_parsed = datetime(*entry.updated_parsed[:6])
diff -r 1ac0b8e2feae -r b0de75d57e78 backend/couchdb/CouchApp/feedworm/views/feeds_with_unread_entries/map.js
--- a/backend/couchdb/CouchApp/feedworm/views/feeds_with_unread_entries/map.js	Mon Nov 12 08:10:40 2012 +0100
+++ b/backend/couchdb/CouchApp/feedworm/views/feeds_with_unread_entries/map.js	Sat May 04 06:23:20 2013 +0200
@@ -2,6 +2,6 @@
 {
     if (doc.doctype == "feedEntry" && !doc.read)
     {
-        emit(doc.feed, null);
+        emit(doc.feed, 1);
     }
 }
diff -r 1ac0b8e2feae -r b0de75d57e78 backend/couchdb/CouchApp/feedworm/views/feeds_with_unread_entries/reduce.js
--- a/backend/couchdb/CouchApp/feedworm/views/feeds_with_unread_entries/reduce.js	Mon Nov 12 08:10:40 2012 +0100
+++ b/backend/couchdb/CouchApp/feedworm/views/feeds_with_unread_entries/reduce.js	Sat May 04 06:23:20 2013 +0200
@@ -1,4 +1,4 @@
 function(keys, values, rereduce)
 {
-    return true;
+    return sum(values);
 }
diff -r 1ac0b8e2feae -r b0de75d57e78 backend/couchdb/CouchDbBackend.py
--- a/backend/couchdb/CouchDbBackend.py	Mon Nov 12 08:10:40 2012 +0100
+++ b/backend/couchdb/CouchDbBackend.py	Sat May 04 06:23:20 2013 +0200
@@ -104,7 +104,7 @@
             feedEntry.markRead(self.database)
 
     def updateAllFeeds(self):
-        # TODO use a view instead of iterating all feeds
+        # TODO: use a view instead of iterating all feeds
         allFeeds = Feed.all(self.database)
         for feed in allFeeds:
             if feed.needsUpdate():