aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/views.py
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-23 21:39:20 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-04-23 21:39:20 +0200
commiteed0706433885207ea7ebae208a072f198a04367 (patch)
treebfe8bd43c1b16bf5b2503a0a1f560156d65085fa /pyaggr3g470r/views.py
parentMinor bugfix. (diff)
downloadnewspipe-eed0706433885207ea7ebae208a072f198a04367.tar.gz
newspipe-eed0706433885207ea7ebae208a072f198a04367.tar.bz2
newspipe-eed0706433885207ea7ebae208a072f198a04367.zip
This fixes #1.
Diffstat (limited to 'pyaggr3g470r/views.py')
-rw-r--r--pyaggr3g470r/views.py23
1 files changed, 13 insertions, 10 deletions
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 11e60880..1afcecb2 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -42,7 +42,7 @@ import models
if not conf.ON_HEROKU:
import search as fastsearch
from forms import SigninForm, AddFeedForm, ProfileForm
-from pyaggr3g470r import app, db
+from pyaggr3g470r import app, db, allowed_file
from pyaggr3g470r.models import User, Feed, Article, Role
Principal(app)
@@ -492,15 +492,18 @@ def management():
"""
if request.method == 'POST':
# Import an OPML file
- data = request.files['opmlfile']
- opml_path = os.path.join("./pyaggr3g470r/var/", data.filename)
- data.save(opml_path)
- try:
- nb, nb_already = utils.import_opml(g.user.email, opml_path)
- flash(str(nb) + " feeds imported (" + str(nb_already) + \
- " already in the database).", "success")
- except Exception as e:
- flash("Impossible to import the new feeds.", "danger")
+ data = request.files.get('opmlfile', None)
+ if None == data or not allowed_file(data.filename):
+ flash('File not allowed.', 'danger')
+ else:
+ opml_path = os.path.join("./pyaggr3g470r/var/", data.filename)
+ data.save(opml_path)
+ try:
+ nb, nb_already = utils.import_opml(g.user.email, opml_path)
+ flash(str(nb) + " feeds imported (" + str(nb_already) + \
+ " already in the database).", "success")
+ except Exception as e:
+ flash("Impossible to import the new feeds.", "danger")
form = AddFeedForm()
bgstack15