aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-12 13:59:39 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-12 13:59:39 +0200
commit5ce93556f3ce4395709117255007449f6a36509c (patch)
treef5e27bfc474739f3712e66de2146f218f8392cce
parentImprovements of queries. (diff)
downloadnewspipe-5ce93556f3ce4395709117255007449f6a36509c.tar.gz
newspipe-5ce93556f3ce4395709117255007449f6a36509c.tar.bz2
newspipe-5ce93556f3ce4395709117255007449f6a36509c.zip
For the moment disable full text search on Heroku.
-rw-r--r--pyaggr3g470r/templates/management.html6
-rw-r--r--pyaggr3g470r/views.py32
2 files changed, 21 insertions, 17 deletions
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html
index c1aad90d..822f3abd 100644
--- a/pyaggr3g470r/templates/management.html
+++ b/pyaggr3g470r/templates/management.html
@@ -5,7 +5,9 @@
<h1>Your subscriptions</h1>
<p>You are subscribed to {{ nb_feeds }} <a href="/feeds">feeds</a>. Add a <a href="/create_feed/">feed</a>.</p>
<p>{{ nb_articles }} articles are stored in the database with {{ nb_unread_articles }} <a href="/unread/">unread articles</a>.</p>
- <a href="/index_database/" class="btn btn-default">Index database</a>
+ {% if not_on_heroku %}
+ <a href="/index_database/" class="btn btn-default">Index database</a>
+ {% endif %}
</div>
<div class="jumbotron">
<h1>Your Profile</h1>
@@ -21,9 +23,11 @@
<h2>Export</h2>
<a href="/export_opml/" class="btn btn-default">Export feeds to OPML</a>
</div>
+ {% if not_on_heroku %}
<div class="jumbotron">
<h1>Export articles</h1>
<a href="/export/" class="btn btn-default">HTML</a>
</div>
+ {% endif %}
</div><!-- /.container -->
{% endblock %}
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 22dedc58..fdb8fbe5 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -33,6 +33,7 @@ from flask.ext.login import LoginManager, login_user, logout_user, login_require
from flask.ext.principal import Principal, Identity, AnonymousIdentity, identity_changed, identity_loaded, Permission, RoleNeed, UserNeed
from werkzeug import generate_password_hash
+import conf
import utils
import export
import feedgetter
@@ -314,14 +315,13 @@ def favorites():
"""
List favorites articles.
"""
- user = User.query.filter(User.id == g.user.id).first()
- result = []
- nb_favorites = 0
- for feed in user.feeds:
+ feeds_with_like = Feed.query.filter(Feed.user_id == g.user.id, Feed.articles.any(like=True))
+ result, nb_favorites = [], 0
+ for feed in feeds_with_like:
new_feed = Feed()
new_feed.id = feed.id
new_feed.title = feed.title
- new_feed.articles = [article for article in feed.articles if article.like]
+ new_feed.articles = Article.query.filter(Article.user_id == g.user.id, Article.feed_id == feed.id, Article.like == True).all()
length = len(new_feed.articles.all())
if length != 0:
result.append(new_feed)
@@ -334,14 +334,13 @@ def unread():
"""
List unread articles.
"""
- user = User.query.filter(User.id == g.user.id).first()
- result = []
- nb_unread = 0
- for feed in user.feeds:
+ feeds_with_unread = Feed.query.filter(Feed.user_id == g.user.id, Feed.articles.any(readed=False))
+ result, nb_unread = [], 0
+ for feed in feeds_with_unread:
new_feed = Feed()
new_feed.id = feed.id
new_feed.title = feed.title
- new_feed.articles = [article for article in feed.articles if not article.readed]
+ new_feed.articles = Article.query.filter(Article.user_id == g.user.id, Article.feed_id == feed.id, Article.readed == False).all()
length = len(new_feed.articles.all())
if length != 0:
result.append(new_feed)
@@ -414,6 +413,9 @@ def search():
"""
Search articles corresponding to the query.
"""
+ if conf.ON_HEROKU:
+ flash("Full text search is not yet implemented for Heroku.", "warning")
+ return redirect(url_for('home'))
user = models.User.objects(email=g.user.email).first()
result = []
query = request.args.get('query', None)
@@ -451,13 +453,11 @@ def management():
form = AddFeedForm()
user = User.query.filter(User.id == g.user.id).first()
nb_feeds = len(user.feeds.all())
- #nb_articles = sum([len(feed.articles) for feed in user.feeds])
- #nb_unread_articles = sum([len([article for article in feed.articles if not article.readed]) for feed in user.feeds])
- #articles = Article.query.filter(Article.feed.subscriber.id == g.user.id).all()
- nb_articles = sum([len(feed.articles.all()) for feed in user.feeds])
- nb_unread_articles = 2
+ nb_articles = len(Article.query.filter(Article.user_id == g.user.id).all())
+ nb_unread_articles = len(Article.query.filter(Article.user_id == g.user.id, Article.readed == False).all())
return render_template('management.html', form=form, \
- nb_feeds=nb_feeds, nb_articles=nb_articles, nb_unread_articles=nb_unread_articles)
+ nb_feeds=nb_feeds, nb_articles=nb_articles, nb_unread_articles=nb_unread_articles, \
+ not_on_heroku = not conf.ON_HEROKU)
@app.route('/history/', methods=['GET'])
@login_required
bgstack15