From 8efcd1b23b28c2916785a884dc409242c6747424 Mon Sep 17 00:00:00 2001
From: cedricbonhomme <devnull@localhost>
Date: Tue, 1 May 2012 15:22:21 +0200
Subject: Added comment. Bugfix at feed/ page.

---
 source/mongodb.py      | 10 ++++++++--
 source/pyAggr3g470r.py | 10 ++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'source')

diff --git a/source/mongodb.py b/source/mongodb.py
index a4c74669..b3527794 100644
--- a/source/mongodb.py
+++ b/source/mongodb.py
@@ -110,7 +110,8 @@ class Articles(object):
 
     def nb_articles(self, feed_id=None):
         """
-        Return the number of users.
+        Return the number of articles of a feed
+        or of all the database.
         """
         if feed_id is not None:
             collection = self.db[feed_id]
@@ -124,7 +125,8 @@ class Articles(object):
 
     def nb_favorites(self, feed_id=None):
         """
-        Return the number of favorites articles.
+        Return the number of favorites articles of a feed
+        or of all the database.
         """
         if feed_id is not None:
             # only for a feed
@@ -150,6 +152,10 @@ class Articles(object):
         return nb_mail_notifications
 
     def nb_unread_articles(self, feed_id=None):
+        """
+        Return the number of unread articles of a feed
+        or of all the database.
+        """
         if feed_id is not None:
             collection = self.db[feed_id]
             cursor = collection.find({'article_readed':False})
diff --git a/source/pyAggr3g470r.py b/source/pyAggr3g470r.py
index 55c37127..5b3cbbd9 100755
--- a/source/pyAggr3g470r.py
+++ b/source/pyAggr3g470r.py
@@ -563,14 +563,16 @@ class Root:
         try:
             feed = self.mongo.get_feed(feed_id)
             articles = self.mongo.get_articles_from_collection(feed_id)
+            nb_articles_feed = self.mongo.nb_articles(feed_id)
+            nb_articles_total = self.mongo.nb_articles()
         except KeyError:
             return self.error_page("This feed do not exists.")
         html = htmlheader()
         html += htmlnav
         html += """<div class="left inner">"""
-        html += "<p>The feed <b>" + feed["feed_title"] + "</b> contains <b>" + str(self.mongo.nb_articles(feed_id)) + "</b> articles. "
-        html += "Representing " + str((round(float(self.mongo.nb_articles(feed_id)) / 1000, 4)) * 100) + " % of the total " #hack
-        html += "(" + str(1000) + ").</p>"
+        html += "<p>The feed <b>" + feed["feed_title"] + "</b> contains <b>" + str(nb_articles_feed) + "</b> articles. "
+        html += "Representing " + str((round(float(nb_articles_feed) / nb_articles_total, 4)) * 100) + " percent of the total "
+        html += "(" + str(nb_articles_total) + ").</p>"
         if articles != []:
             html += "<p>" + (self.mongo.nb_unread_articles(feed_id) == 0 and ["All articles are read"] or [str(self.mongo.nb_unread_articles(feed_id)) + \
                     " unread article" + (self.mongo.nb_unread_articles(feed_id) == 1 and [""] or ["s"])[0]])[0] + ".</p>"
@@ -587,7 +589,7 @@ class Root:
             delta_today = datetime.datetime.fromordinal(datetime.date.today().toordinal()) - last_article
             html += "<p>The last article was posted " + str(abs(delta_today.days))  + " day(s) ago.</p>"
             if delta.days > 0:
-                html += """<p>Daily average: %s,""" % (str(round(float(self.mongo.nb_articles(feed_id))/abs(delta.days), 2)),)
+                html += """<p>Daily average: %s,""" % (str(round(float(nb_articles_feed)/abs(delta.days), 2)),)
                 html += """ between the %s and the %s.</p>\n""" % \
 	              (str(articles[self.mongo.nb_articles(feed_id)-2]["article_date"])[:10], str(articles[0]["article_date"])[:10])
 
-- 
cgit