diff options
| -rw-r--r-- | mongodb.py | 7 | ||||
| -rwxr-xr-x | pyAggr3g470r.py | 11 |
2 files changed, 12 insertions, 6 deletions
@@ -64,14 +64,17 @@ class Articles(object): collection = self.db[str(feed_id)] return collection.find({"article_id":article_id}).next() - def get_all_collections(self): + def get_all_collections(self, condition=None): """ """ feeds = [] collections = self.db.collection_names() for collection_name in collections: if collection_name != "system.indexes": - cursor = self.db[collection_name].find({"type":0}) + if condition is None: + cursor = self.db[collection_name].find({"type":0}) + else: + cursor = self.db[collection_name].find({"type":0, condition[0]:condition[1]}) if cursor.count() != 0: feeds.append(cursor.next()) feeds = sorted(feeds, key=itemgetter('feed_title')) diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py index ccb47150..72c8272e 100755 --- a/pyAggr3g470r.py +++ b/pyAggr3g470r.py @@ -983,11 +983,14 @@ class Root: html = htmlheader() html += htmlnav html += """<div class="left inner">""" - html += "<h1>You are receiving e-mails for the following feeds:</h1>\n" - for feed in self.feeds.values(): - if feed.mail == "1": + feeds = self.articles.get_all_collections(condition=("mail",True)) + if feeds != []: + html += "<h1>You are receiving e-mails for the following feeds:</h1>\n" + for feed in feeds: html += """\t<a href="/articles/%s">%s</a> - <a href="/mail_notification/0:%s">Stop</a><br />\n""" % \ - (feed.feed_id, feed.feed_title, feed.feed_id) + (feed["feed_id"], feed.feed_title, feed.feed_id) + else: + html += "<p>No active notifications.<p>\n" html += """<p>Notifications are sent to: <a href="mail:%s">%s</a></p>""" % \ (utils.mail_to, utils.mail_to) html += "\n<hr />\n" + htmlfooter |