+ add Web App (WIP)

2021-01-13 22:30:45 +01:00
parent a47f2c06ac
commit cd128cbe5c
9 changed files with 210 additions and 7 deletions
--- a/Web/init.py
+++ b/Web/init.py
@@ -0,0 +1,13 @@
+from flask import Flask
+from Web.config import Config
+
+app = Flask(__name__)
+
+def create_app(config_class=Config):
+    app.config.from_object(config_class)
+
+    from Web.main.routes import main
+
+    app.register_blueprint(main)
+
+    return app
--- a/Web/config.py
+++ b/Web/config.py
@@ -0,0 +1,3 @@
+class Config():
+    SECRET_KEY = '4542bae72a9fefada779b8c3fc68a826'
+    UPLOAD_FOLDER = '/path/to/the/uploads'
--- a/Web/main/init.py
+++ b/Web/main/init.py
--- a/Web/main/forms.py
+++ b/Web/main/forms.py
@@ -0,0 +1,7 @@
+from flask_wtf import FlaskForm
+from wtforms import FileField, SubmitField
+from flask_wtf.file import FileAllowed
+
+class UploadJavaForm(FlaskForm):
+    java = FileField('.java hochladen', validators=[FileAllowed(['java', 'txt'])])
+    submit = SubmitField('Bestätigen')
--- a/Web/main/routes.py
+++ b/Web/main/routes.py
@@ -0,0 +1,75 @@
+from flask.helpers import send_file
+import Web
+from flask import render_template, abort, flash, Blueprint
+from Web.main.forms import UploadJavaForm
+from random import randint
+import shutil as zip
+import secrets
+import os
+import logging
+
+UPLOAD_FOLDER = '/path/to/'
+ALLOWED_EXTENSIONS = {'java','txt'}
+
+from gui.utils import nassi
+from interpreter.NassiShneidermann import NassiShneidermanDiagram, OB
+
+main = Blueprint('main', __name__)
+
+def allowed_file(filename):
+    return '.' in filename and \
+           filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
+
+def javaDatei(form_file):
+    try:
+        random_hex = secrets.token_hex(8)
+        _, f_ext = os.path.splitext(form_file.filename)
+        file_fname = random_hex + f_ext
+        dirctory_path = os.path.abspath(os.path.join('Web', os.pardir))
+        file_path = os.path.join(dirctory_path, './tmp/input', file_fname)
+        form_file.save(file_path)
+        return file_path
+    except:
+        flash('Hier ist was falsch gelaufen!')
+
+
+@main.route('/', methods=['POST', 'GET'])
+@main.route('/generator', methods=['POST','GET'])
+def generator():
+    form = UploadJavaForm()
+
+    if form.validate_on_submit():
+        if form.java.data:
+            input_path = javaDatei(form.java.data)
+            output_path = os.path.join(os.path.abspath(os.path.join('Web', os.pardir)), './tmp/input')
+            outputname = str(randint(0, 100) )
+            remove_tags = None 
+            comments = None 
+            behaviour = OB.RANDOM_NAME 
+            types = None
+
+            NSD = NassiShneidermanDiagram(True)
+            output_directory = output_path + '/' + outputname
+            
+            # if font_filepath != None:
+            #     NSD.set_font(font_filepath)
+
+            try:
+                if not os.path.exists(output_directory):
+                    os.makedirs(output_directory)
+            except OSError:
+                logging.error('Error: Creating directory. ' +  output_directory)
+
+
+            custom_tags = {"comments" : comments, "ignore" : remove_tags, "types" : types}
+            
+            NSD.load_from_file(input_path, custom_tags)
+            NSD.convert_to_image(output_directory, on_conflict=behaviour)
+
+            zip_path = os.path.join(os.path.abspath(os.path.join('Web', os.pardir)), f'../tmp/output/{outputname}')
+            zip.make_archive(zip_path, 'zip', output_directory) 
+
+            return send_file(zip_path + '.zip', as_attachment=True)
+
+    return render_template('upload.html', title='', legend='', form=form )
+    
--- a/Web/templates/layout.html
+++ b/Web/templates/layout.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+
+    <link rel="stylesheet" type="text/css" href="">
+
+    {% if title %}
+        <title>NassiShneiderman Generator - {{ title }}</title>
+    {% else %}
+        <title>NassiShneiderman Generator</title>
+    {% endif %}
+    
+</head>
+<body>
+    <header class="site-header">
+        <nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top">
+          <div class="container">
+            <a class="navbar-brand mr-4" href="/">NassiShneiderman Generator</a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
+              <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarToggle">
+              <div class="navbar-nav mr-auto">
+                <a class="nav-item nav-link" href="">Home</a>
+                <a class="nav-item nav-link" href="">Datenschutz</a>
+              </div>
+              <!-- Navbar Right Side -->
+              <div class="navbar-nav">
+                
+              </div>
+            </div>
+          </div>
+        </nav>
+    </header>
+
+    <main role="main" class="container">
+      <div class="row">
+        <div class="col-md-8">
+          {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %} 
+              {% for category, message in messages %}
+                <div class="alert alert-{{ category }}">
+                  {{message}}
+                </div>
+              {% endfor %}
+            {% endif %}
+          {% endwith %}
+          {% block content %}{% endblock %}
+        </div>
+
+
+
+      </div>
+  </main>
+
+    <!-- Optional JavaScript -->
+    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
+    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</body>
+</html>
--- a/Web/templates/upload.html
+++ b/Web/templates/upload.html
@@ -0,0 +1,29 @@
+{% extends 'layout.html' %}
+{% block content %}
+    <div class="content-section">
+        {{ form.hidden_tag() }}
+        <div class="media">
+            <div class="media-body">
+                <p>Test Page</p>
+            </div>
+        </div>
+        <form method='Post' action='' enctype="multipart/form-data">
+            {{ form.hidden_tag() }}
+            <fieldset class="form-group">
+                <legend class="border-bottom mb-4">.java hochladen:</legend>
+                <div class="form-group">
+                    {{ form.java.label() }}
+                    {{ form.java(class="form-control-file") }}
+                    {% if form.java.errors %}
+                        {% for error in form.java.errors %}
+                        <span class="text-danger">{{ error }}</span></br>
+                        {% endfor %}
+                    {% endif %}
+                </div>
+                <div class="form-group">
+                    {{ form.submit(class="btn-outline-info") }}
+                </div>
+            </fieldset>
+        </form>
+    </div>
+{% endblock content %}
--- a/interpreter/NassiShneidermann.py
+++ b/interpreter/NassiShneidermann.py
@@ -62,9 +62,9 @@ class NassiShneidermanDiagram:
        number_of_item = 1
        for scope in self.function_scopes:
            number_of_item += 1
-            cancel = one_line_progress_meter('Progress', number_of_item, len(self.function_scopes), '-PROGRESSBAR-')
-            if not cancel:
-                return False
+            # cancel = one_line_progress_meter('Progress', number_of_item, len(self.function_scopes), '-PROGRESSBAR-')
+            # if not cancel:
+            #     return False

            filepath = f"{output_path}/{scope.name}"
            filepath = self.check_conflicts(filepath, on_conflict)
--- a/run.py
+++ b/run.py
@@ -1,7 +1,15 @@
 #!/usr/bin/env python
-from gui.gui import Gui
-import sys
+# from gui.gui import Gui
+# import sys

-do_debug = "--debug" in sys.argv
+# do_debug = "--debug" in sys.argv

-Gui(theme='DarkGrey11', debug_mode=do_debug)
+# Gui(theme='DarkGrey11', debug_mode=do_debug)
+
+# Web App
+from Web import create_app
+
+app = create_app()
+
+if __name__ == '__main__':
+    app.run(port=5000 ,debug=True)