From cb6a8d8b53bb27755eb9bc040f86a361636d4c6a Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 8 Jun 2014 17:47:42 +0200 Subject: adding the capacity to mark articles as unread --- pyaggr3g470r/views.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'pyaggr3g470r/views.py') diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py index e4668f54..1f3e16d7 100644 --- a/pyaggr3g470r/views.py +++ b/pyaggr3g470r/views.py @@ -312,23 +312,31 @@ def article(article_id=None): return redirect(redirect_url()) -@app.route('/mark_as_read/', methods=['GET']) -@app.route('/mark_as_read/', methods=['GET']) +@app.route('/mark_as/', methods=['GET']) +@app.route('/mark_as//feed/', methods=['GET']) +@app.route('/mark_as//article/', methods=['GET']) @login_required @feed_access_required -def mark_as_read(feed_id=None): +def mark_as(new_value='read', feed_id=None, article_id=None): """ Mark all unreaded articles as read. """ + readed = new_value == 'read' + articles = Article.query.filter(Article.user_id == g.user.id) if feed_id is not None: - Article.query.filter(Article.user_id == g.user.id, Article.feed_id == feed_id, - Article.readed == False).update({"readed": True}) - flash(gettext('Articles marked as read.'), 'info') + articles = articles.filter(Article.feed_id == feed_id) + message = 'Feed marked as %s.' + elif article_id is not None: + articles = articles.filter(Article.id == article_id) + message = 'Article marked as %s.' else: - Article.query.filter(Article.user_id == g.user.id, Article.readed == False).update({"readed": True}) - flash(gettext("All articles marked as read"), 'info') + message = 'All article marked as %s.' + articles.filter(Article.readed == (not readed)).update({"readed": readed}) + flash(gettext(message % new_value), 'info') db.session.commit() - return redirect(redirect_url()) + if readed: + return redirect(redirect_url()) + return redirect('/#%d' % articles.first().feed_id) @app.route('/like/', methods=['GET']) @login_required -- cgit From 9731e3604fe360f662a042f3249bb39ddec6adf5 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Wed, 11 Jun 2014 23:55:06 +0200 Subject: redoing home page --- pyaggr3g470r/views.py | 61 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 21 deletions(-) (limited to 'pyaggr3g470r/views.py') diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py index 1f3e16d7..2ad1ea5a 100644 --- a/pyaggr3g470r/views.py +++ b/pyaggr3g470r/views.py @@ -28,9 +28,13 @@ __license__ = "AGPLv3" import os import datetime -from flask import render_template, request, flash, session, url_for, redirect, g, current_app, make_response -from flask.ext.login import LoginManager, login_user, logout_user, login_required, current_user, AnonymousUserMixin -from flask.ext.principal import Principal, Identity, AnonymousIdentity, identity_changed, identity_loaded, Permission, RoleNeed, UserNeed +from flask import abort, render_template, request, flash, session, \ + url_for, redirect, g, current_app, make_response +from flask.ext.login import LoginManager, login_user, logout_user, \ + login_required, current_user, AnonymousUserMixin +from flask.ext.principal import Principal, Identity, AnonymousIdentity, \ + identity_changed, identity_loaded, Permission,\ + RoleNeed, UserNeed from flask.ext.babel import gettext from sqlalchemy import desc from sqlalchemy.exc import IntegrityError @@ -209,23 +213,38 @@ def signup(): @app.route('/') @login_required def home(): - """ - The home page lists most recent articles of all feeds. - """ - #user = User.query.filter(User.email == g.user.email).first() - result = [] - for feed in g.user.feeds: - new_feed = Feed() - new_feed.id = feed.id - new_feed.title = feed.title - new_feed.enabled = feed.enabled - new_feed.articles = feed.articles[:9] - #new_feed.articles = Article.query.filter(Article.user_id == g.user.id, - #Article.feed_id == feed.id).order_by(desc("Article.date")).limit(9) - new_feed.nb_unread = Article.query.filter(Article.user_id == g.user.id, Article.feed_id == feed.id, Article.readed == False).count() - result.append(new_feed) - unread_articles = len(Article.query.filter(Article.user_id == g.user.id, Article.readed == False).all()) - return render_template('home.html', result=result, head_title=unread_articles) + feeds = {feed.id: feed.title for feed in g.user.feeds if feed.enabled} + articles = Article.query.filter(Article.feed_id.in_(feeds.keys())) + filter_ = request.args.get('filter_', 'unread') + feed_id = int(request.args.get('feed', 0)) + limit = request.args.get('limit', 1000) + if filter_ != 'all': + articles = articles.filter(Article.readed == (filter_ == 'read')) + if feed_id: + articles = articles.filter(Article.feed_id == feed_id) + + articles = articles.order_by(Article.date.desc()) + if limit != 'all': + limit = int(limit) + articles = articles.limit(limit) + def gen_url(filter_=filter_, limit=limit, feed=feed_id): + return '/?filter_=%s&limit=%s&feed=%d' % (filter_, limit, feed) + return render_template('reader.html', gen_url=gen_url, feed_id=feed_id, + filter_=filter_, limit=limit, feeds=feeds, + articles=articles.all()) + + +@app.route('/article/redirect/', methods=['GET']) +@login_required +def redirect_to_article(article_id): + article = Article.query.filter(Article.id == article_id, + Article.user_id == g.user.id).first() + if article is None: + abort(404) + article.readed = True + db.session.commit() + return redirect(article.link) + @app.route('/fetch/', methods=['GET']) @app.route('/fetch/', methods=['GET']) @@ -336,7 +355,7 @@ def mark_as(new_value='read', feed_id=None, article_id=None): db.session.commit() if readed: return redirect(redirect_url()) - return redirect('/#%d' % articles.first().feed_id) + return redirect(redirect_url()) @app.route('/like/', methods=['GET']) @login_required -- cgit From 189daeb5862dcf6d89e5070c019cd584c26e73a6 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Thu, 12 Jun 2014 01:50:08 +0200 Subject: reimplementing the unread count in left menu --- pyaggr3g470r/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pyaggr3g470r/views.py') diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py index 2ad1ea5a..1b3be75e 100644 --- a/pyaggr3g470r/views.py +++ b/pyaggr3g470r/views.py @@ -36,7 +36,7 @@ from flask.ext.principal import Principal, Identity, AnonymousIdentity, \ identity_changed, identity_loaded, Permission,\ RoleNeed, UserNeed from flask.ext.babel import gettext -from sqlalchemy import desc +from sqlalchemy import desc, func from sqlalchemy.exc import IntegrityError from werkzeug import generate_password_hash @@ -227,11 +227,14 @@ def home(): if limit != 'all': limit = int(limit) articles = articles.limit(limit) + unread = db.session.query(Article.feed_id, func.count(Article.id))\ + .filter(Article.readed == False)\ + .group_by(Article.feed_id).all() def gen_url(filter_=filter_, limit=limit, feed=feed_id): return '/?filter_=%s&limit=%s&feed=%d' % (filter_, limit, feed) - return render_template('reader.html', gen_url=gen_url, feed_id=feed_id, + return render_template('home.html', gen_url=gen_url, feed_id=feed_id, filter_=filter_, limit=limit, feeds=feeds, - articles=articles.all()) + unread=dict(unread), articles=articles.all()) @app.route('/article/redirect/', methods=['GET']) -- cgit