From dc0cf1a2789293bb3459ea8fe1f611edda075eba Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Sun, 12 Apr 2015 21:44:20 +0200 Subject: redoing conf gathering and using it in templates --- pyaggr3g470r/views/views.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pyaggr3g470r/views/views.py') diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py index 1918b1b5..e70a8c6f 100644 --- a/pyaggr3g470r/views/views.py +++ b/pyaggr3g470r/views/views.py @@ -139,6 +139,7 @@ def get_timezone(): except: return conf.TIME_ZONE["en"] + @app.context_processor def inject_feed_form(): """ @@ -147,8 +148,7 @@ def inject_feed_form(): Context processors run before the template is rendered and have the ability to inject new values into the template context. """ - return dict(create_feed_form=AddFeedForm(), - on_heroku=conf.ON_HEROKU) + return dict(create_feed_form=AddFeedForm()) # # Views. @@ -285,8 +285,7 @@ def home(favorites=False): return render_template('home.html', gen_url=gen_url, feed_id=feed_id, filter_=filter_, limit=limit, feeds=feeds, unread=unread, articles=articles, in_error=in_error, - head_title=head_title, favorites=favorites, - default_max_error = conf.DEFAULT_MAX_ERROR) + head_title=head_title, favorites=favorites) @app.route('/favorites') -- cgit From b8416422b53a8b99738fef712a1857cdbbf8b887 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Tue, 14 Apr 2015 08:53:40 +0200 Subject: making fetch call dependent to the crawling method option --- pyaggr3g470r/views/views.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'pyaggr3g470r/views/views.py') diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py index e70a8c6f..d0c06da0 100644 --- a/pyaggr3g470r/views/views.py +++ b/pyaggr3g470r/views/views.py @@ -302,7 +302,8 @@ def fetch(feed_id=None): Triggers the download of news. News are downloaded in a separated process, mandatory for Heroku. """ - if not conf.ON_HEROKU or g.user.is_admin(): + if conf.CRAWLING_METHOD == "classic" \ + and (not conf.ON_HEROKU or g.user.is_admin()): utils.fetch(g.user.id, feed_id) flash(gettext("Downloading articles..."), "info") else: @@ -519,11 +520,14 @@ def management(): else: try: nb = utils.import_opml(g.user.email, data.read()) - utils.fetch(g.user.email, None) - flash(str(nb) + ' ' + gettext('feeds imported.'), "success") - flash(gettext("Downloading articles..."), 'info') + if conf.CRAWLING_METHOD == "classic": + utils.fetch(g.user.email, None) + flash(str(nb) + ' ' + gettext('feeds imported.'), + "success") + flash(gettext("Downloading articles..."), 'info') except: - flash(gettext("Impossible to import the new feeds."), "danger") + flash(gettext("Impossible to import the new feeds."), + "danger") elif None != request.files.get('jsonfile', None): # Import an account data = request.files.get('jsonfile', None) @@ -534,7 +538,8 @@ def management(): nb = utils.import_json(g.user.email, data.read()) flash(gettext('Account imported.'), "success") except: - flash(gettext("Impossible to import the account."), "danger") + flash(gettext("Impossible to import the account."), + "danger") else: flash(gettext('File not allowed.'), 'danger') -- cgit