Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API: minr refactor

Browse Source
This commit is contained in:
Sam 2018-05-01 17:58:51 +02:00
parent f4f0d5a2aa
commit efd076aa41
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mpwo_api/mpwo_api/users/utils.py
View File

@ -6,18 +6,6 @@ from flask import current_app, jsonify, request
from .models import User from .models import User
def allowed_activity(filename):
return '.' in filename and \
filename.rsplit('.', 1)[1].lower() in \
current_app.config.get('ACTIVITY_ALLOWED_EXTENSIONS')
def allowed_picture(filename):
return '.' in filename and \
filename.rsplit('.', 1)[1].lower() in \
current_app.config.get('PICTURE_ALLOWED_EXTENSIONS')
def verify_extension(file_type, req): def verify_extension(file_type, req):
response_object = {'status': 'success'} response_object = {'status': 'success'}
@ -30,8 +18,15 @@ def verify_extension(file_type, req):
response_object = {'status': 'fail', 'message': 'No selected file.'} response_object = {'status': 'fail', 'message': 'No selected file.'}
return response_object return response_object
if ((file_type == 'picture' and not allowed_picture(file.filename)) or allowed_extensions = (
(file_type == 'activity' and not allowed_activity(file.filename))): 'ACTIVITY_ALLOWED_EXTENSIONS'
if file_type == 'activity'
else 'PICTURE_ALLOWED_EXTENSIONS'
)
if not ('.' in file.filename and
file.filename.rsplit('.', 1)[1].lower() in
current_app.config.get(allowed_extensions)):
response_object = { response_object = {
'status': 'fail', 'status': 'fail',
'message': 'File extension not allowed.' 'message': 'File extension not allowed.'