aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/views
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-04-14 08:53:40 +0200
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-04-14 08:53:40 +0200
commitb8416422b53a8b99738fef712a1857cdbbf8b887 (patch)
treee5c6bdb02c2ed6d30ec2f0aff17b49390d386614 /pyaggr3g470r/views
parentredoing conf gathering and using it in templates (diff)
downloadnewspipe-b8416422b53a8b99738fef712a1857cdbbf8b887.tar.gz
newspipe-b8416422b53a8b99738fef712a1857cdbbf8b887.tar.bz2
newspipe-b8416422b53a8b99738fef712a1857cdbbf8b887.zip
making fetch call dependent to the crawling method option
Diffstat (limited to 'pyaggr3g470r/views')
-rw-r--r--pyaggr3g470r/views/feed.py3
-rw-r--r--pyaggr3g470r/views/views.py17
2 files changed, 13 insertions, 7 deletions
diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py
index 11d14ac2..159dce64 100644
--- a/pyaggr3g470r/views/feed.py
+++ b/pyaggr3g470r/views/feed.py
@@ -163,7 +163,8 @@ def form(feed_id=None):
flash(gettext('Feed %(feed_title)r successfully created.',
feed_title=new_feed.title), 'success')
- utils.fetch(g.user.id, new_feed.id)
+ if conf.CRAWLING_METHOD == "classic":
+ utils.fetch(g.user.id, new_feed.id)
flash(gettext("Downloading articles for the new feed..."), 'info')
return redirect(url_for('feed.form',
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')
bgstack15