increase upload bandwidth and render html with template generator

cosmic-byte · cosmic-byte · commit c7cd576ea601 · 2017-12-05T11:42:55.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -100,4 +100,6 @@ ENV/
 
 # mypy
 .mypy_cache/
-.gitignore/
+.gitignore
+.idea/*
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/webService/app/__init__.py b/webService/app/__init__.py
@@ -8,7 +8,7 @@
 # create app
 app = Flask(__name__)
 CORS(app)
-app.config['MAX_CONTENT_LENGTH'] = 3 * 1024 * 1024
+app.config['MAX_CONTENT_LENGTH'] = 10 * 1024 * 1024
 app.config.from_object(settings)
 
 # register blueprints/modules
diff --git a/webService/app/module_one/templates/view.html b/webService/app/module_one/templates/view.html
@@ -0,0 +1,26 @@
+<!doctype html>
+    <title>Compare</title>
+    <head>
+        <style>
+        #main {
+            width: 600px;
+            height: 300px;
+            border: 1px solid #c3c3c3;
+
+        }
+        #main div {
+            display: inline-block;
+            width: 400px;
+            margin: 20px;
+        }
+        #main b {
+            margin: 0 10px 0 0;
+        }
+        </style>
+    </head>
+    <h1>Upload Pictures to Compare</h1>
+    <form method=post enctype=multipart/form-data id=main>
+      <div><b>known image:</b><input type=file name=file1></div>
+      <div><b>unknown image:</b><input type=file name=file2></div>
+      <div><input type=submit value=process></div>
+    </form>
diff --git a/webService/app/module_one/views.py b/webService/app/module_one/views.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from flask import Blueprint
 import face_recognition
-from flask import request, redirect, jsonify
+from flask import request, redirect, jsonify, render_template
 
 ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg'}
 
@@ -33,34 +33,7 @@ def compare():
         if file and allowed_file(file.filename) and allowed_file(file2.filename):
             return process_images(file, file2)
 
-    return '''
-    <!doctype html>
-    <title>Compare</title>
-    <head>
-        <style> 
-        #main {
-            width: 600px;
-            height: 300px;
-            border: 1px solid #c3c3c3;
-
-        }
-        #main div {
-            display: inline-block;
-            width: 400px;
-            margin: 20px;
-        }
-        #main b {
-            margin: 0 10px 0 0;
-        }
-        </style>
-    </head>
-    <h1>Upload Pictures to Compare</h1>
-    <form method=post enctype=multipart/form-data id=main>
-      <div><b>known image:</b><input type=file name=file1></div>
-      <div><b>unknown image:</b><input type=file name=file2></div>
-      <div><input type=submit value=process></div>
-    </form>
-    '''
+    return render_template("view.html")
 
 
 def allowed_file(filename):
diff --git a/webcam/upload.py b/webcam/upload.py
@@ -1,12 +1,9 @@
-import os
 import face_recognition
 from flask import Flask, request, redirect, jsonify
 
-UPLOAD_FOLDER = os.path.abspath("images/")
 ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg'}
 
 app = Flask(__name__)
-app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 app.config['MAX_CONTENT_LENGTH'] = 3 * 1024 * 1024
 
 
