aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2012-11-30 18:55:52 +0100
committerCédric Bonhomme <kimble.mandel@gmail.com>2012-11-30 18:55:52 +0100
commitd7fa4f1335894c56d82f4b95fd00c6661db48d2e (patch)
treea1332fad93ac10abc02cad4fc7f49b50990391a5 /source
parentCode factorization... (diff)
downloadnewspipe-d7fa4f1335894c56d82f4b95fd00c6661db48d2e.tar.gz
newspipe-d7fa4f1335894c56d82f4b95fd00c6661db48d2e.tar.bz2
newspipe-d7fa4f1335894c56d82f4b95fd00c6661db48d2e.zip
Reorganisation
Diffstat (limited to 'source')
-rw-r--r--source/mongodb.py56
1 files changed, 28 insertions, 28 deletions
diff --git a/source/mongodb.py b/source/mongodb.py
index 66b2865c..4b777863 100644
--- a/source/mongodb.py
+++ b/source/mongodb.py
@@ -104,7 +104,7 @@ class Articles(object):
get_articles(feed["feed_id"], condition=("article_readed", False)) will
return all unread articles of feed.
"""
- if feed_id == None:
+ if feed_id == None and article_id == None:
# Return all articles.
articles = []
collections = self.db.collection_names()
@@ -130,6 +130,21 @@ class Articles(object):
collection = self.db[str(feed_id)]
return next(collection.find({"article_id":article_id}))
+ def get_favorites(self, feed_id=None):
+ """
+ Return favorites articles.
+ """
+ if feed_id is not None:
+ # only for a feed
+ collection = self.db[feed_id]
+ cursor = collection.find({'type':1, 'article_like':True})
+ return cursor.sort([("article_date", pymongo.DESCENDING)])
+ else:
+ favorites = []
+ for feed_id in self.db.collection_names():
+ favorites += self.get_favorites(feed_id)
+ return favorites
+
def nb_articles(self, feed_id=None):
"""
Return the number of articles of a feed
@@ -145,20 +160,22 @@ class Articles(object):
nb_articles += self.nb_articles(feed_id)
return nb_articles
- def get_favorites(self, feed_id=None):
+ def nb_unread_articles(self, feed_id=None):
"""
- Return favorites articles.
+ Return the number of unread articles of a feed
+ or of all the database.
"""
if feed_id is not None:
- # only for a feed
- collection = self.db[feed_id]
- cursor = collection.find({'type':1, 'article_like':True})
- return cursor.sort([("article_date", pymongo.DESCENDING)])
+ return self.get_articles(feed_id=feed_id, condition=("article_readed", False)).count()
else:
- favorites = []
- for feed_id in self.db.collection_names():
- favorites += self.get_favorites(feed_id)
- return favorites
+ return len(self.get_articles(condition=("article_readed", False)))
+
+ def like_article(self, like, feed_id, article_id):
+ """
+ Like or unlike an article.
+ """
+ collection = self.db[str(feed_id)]
+ collection.update({"article_id": article_id}, {"$set": {"article_like": like}})
def nb_favorites(self, feed_id=None):
"""
@@ -181,23 +198,6 @@ class Articles(object):
nb_mail_notifications += cursor.count()
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:
- return self.get_articles(feed_id=feed_id, condition=("article_readed", False)).count()
- else:
- return len(self.get_articles(condition=("article_readed", False)))
-
- def like_article(self, like, feed_id, article_id):
- """
- Like or unlike an article.
- """
- collection = self.db[str(feed_id)]
- collection.update({"article_id": article_id}, {"$set": {"article_like": like}})
-
def mark_as_read(self, readed, feed_id=None, article_id=None):
"""
"""
bgstack15