From efd076aa41f9ee089309f962fe1282eceb86fe2f Mon Sep 17 00:00:00 2001
From: Sam <sam@samr1.net>
Date: Tue, 1 May 2018 17:58:51 +0200
Subject: [PATCH] API: minr refactor

---
 mpwo_api/mpwo_api/users/utils.py | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/mpwo_api/mpwo_api/users/utils.py b/mpwo_api/mpwo_api/users/utils.py
index f2916128..da6670a7 100644
--- a/mpwo_api/mpwo_api/users/utils.py
+++ b/mpwo_api/mpwo_api/users/utils.py
@@ -6,18 +6,6 @@ from flask import current_app, jsonify, request
 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):
     response_object = {'status': 'success'}
 
@@ -30,8 +18,15 @@ def verify_extension(file_type, req):
         response_object = {'status': 'fail', 'message': 'No selected file.'}
         return response_object
 
-    if ((file_type == 'picture' and not allowed_picture(file.filename)) or
-            (file_type == 'activity' and not allowed_activity(file.filename))):
+    allowed_extensions = (
+        '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 = {
             'status': 'fail',
             'message': 'File extension not allowed.'