Merge branch 'main' of https://github.com/plexx-dev/Nassi-Shneiderman-Diagramm-Generator

README.md

@@ -7,5 +7,4 @@ In the final version, you will just have to execute the nassi.exe and choose you
 
 Using:
 Python 3.9.1 with 
-PySimpleGUI &
+PySimpleGUI, Pillow, Flask & wtforms
-Pillow

draw/code_to_image.py

@@ -6,7 +6,10 @@ datei_endung = ".png"
 
 img = None
 output_img = None
-_bkp_font = ImageFont.truetype("res/fonts/NotoSans-Regular.ttf", 12) #in case set_font does funky stuff, backup the original font
+
+_bkp_font = ImageFont.load_default()
+
+ #in case set_font does funky stuff, backup the original font
 font = _bkp_font
 
 
@@ -77,7 +80,7 @@ def draw_if_statement(condition: str, x: int, y: int, true_sz: int, false_sz: in
     return x, y + text_y_size, true_sz, ysize - text_y_size, x + true_sz, y + text_y_size, false_sz, ysize - text_y_size
 
 def draw_while_loop_front(condition: str, x: int, y: int, xsize: int, ysize: int):
-    
+
     if not output_img:
         raise Exception("Output image was not initialized! Make sure to call NSD_init first")
 
@@ -98,7 +101,7 @@ def draw_while_loop_front(condition: str, x: int, y: int, xsize: int, ysize: int
     return x + xsize * .1, y + text_y_sz, xsize * .9
 
 def draw_while_loop_back(condition: str, x: int, y: int, xsize: int, ysize: int):
-    
+
     if not output_img:
         raise Exception("Output image was not initialized! Make sure to call NSD_init first")
 

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-')
+            # cancel = one_line_progress_meter('Progress', number_of_item, len(self.function_scopes), '-PROGRESSBAR-')
-            if not cancel:
+            # if not cancel:
-                return False
+            #     return False
 
             filepath = f"{output_path}/{scope.name}"
             filepath = self.check_conflicts(filepath, on_conflict)

interpreter/interpret_source.py

@@ -118,7 +118,7 @@ class JavaInterpreter:
     def _get_scope_start_offset(self, i: int) -> int:
         if self._check_src(i, "{"):
             return 1
-        elif self._check_src(i+1, "{"):      
+        elif self._check_src(i+1, "{"):
             return 2
         raise ScopeNotFoundException("Unable to find scope start. Is the program ill-formed?")
 
@@ -128,7 +128,7 @@ class JavaInterpreter:
         instruction_txt = line[6:bracket_idx]
         child_instructions, idx = self._get_subscope(idx)
         return while_instruction_front(("while" + instruction_txt), child_instructions), idx
-    
+
     def _get_subscope(self, idx: int):
         brace_offset = self._get_scope_start_offset(idx)
         return self._get_instructions_in_scope(idx+brace_offset)
@@ -144,7 +144,7 @@ class JavaInterpreter:
             else:
                 logging.debug("found else construct in line: %i", idx+1)
                 instructions, idx = self._get_subscope(idx)
-        
+
         elif self._check_line_start(idx+1, "else"):
             if self._check_src(idx+1, "if("):
                 logging.debug("found else if construct in line: %i", idx+2)
@@ -155,7 +155,7 @@ class JavaInterpreter:
                 logging.debug("found else construct in line: %i", idx+2)
                 instructions, idx = self._get_subscope(idx+1)
         return instructions, idx
-        
+
 
     def _handle_if(self, line: str, idx: int):
         bracket_idx = line.rindex(')') # throws if the contruct is illformed
@@ -164,7 +164,7 @@ class JavaInterpreter:
         true_instructions, idx = self._get_subscope(idx)
 
         false_instructions, idx = self._get_else_scope(idx)
-        
+
         return if_instruction(instruction_txt, true_instructions, false_instructions), idx
 
     def _handle_do_while(self, line: str, idx: int):
@@ -193,7 +193,7 @@ class JavaInterpreter:
             var = segments[0][4:]
             cond = segments[1]
             inc = segments[2][:-2]
-            
+
             instructions = []
 
             if cond == "": #did you know test expressions where optional and defaulted to true? Me neither
@@ -202,16 +202,16 @@ class JavaInterpreter:
             if var != "":
                 variable_instruction = self._handle_variable(var, idx)[0]
                 instructions.append(variable_instruction)
-            
+
             brace_offset =  self._get_scope_start_offset(idx)
             child_instructions, idx = self._get_instructions_in_scope(idx+brace_offset)
-            
+
             if inc != "":
                 increment_instruction = generic_instruction(inc)
                 child_instructions.append(increment_instruction)
 
             instructions.append(for_instruction("while " + cond, child_instructions))
-            
+
             return instructions, idx
 
         except IndexError:
@@ -232,7 +232,7 @@ class JavaInterpreter:
         if line.startswith("while("):
             logging.debug("Found while construct in line: %i", idx+1)
             return self._handle_while(line, idx)
-        
+
         elif line.startswith("if("):
             logging.debug("Found if construct in line: %i", idx+1)
             return self._handle_if(line, idx)
@@ -258,7 +258,7 @@ class JavaInterpreter:
         i = idx
         while i < len(self._lines):
             line = self._lines[i]
-            
+
             if self._check_src(i, '}'):
                 break
 
@@ -270,7 +270,7 @@ class JavaInterpreter:
 
             i += 1
         return scope, i
-    
+
     def _remove_keywords(self):
         self.src = self._src.replace(' ', '')
         self.src = self._comment_pattern.sub('', self.src)

run.py

@@ -4,4 +4,7 @@ import sys
 
 do_debug = "--debug" in sys.argv
 
-Gui(theme='DarkGrey11', debug_mode=do_debug)
+Gui(theme='DarkGrey11', debug_mode=do_debug)
+
+
+

run_web.py

@@ -0,0 +1,7 @@
+from web_app import create_app
+
+
+app = create_app()
+
+if __name__ == '__main__':
+    app.run(port=7467 ,debug=False)

web_app/__init__.py

@@ -0,0 +1,15 @@
+from flask import Flask
+from web_app.config import Config
+
+app = Flask(__name__)
+
+def create_app(config_class=Config):
+    app.config.from_object(config_class)
+
+    from web_app.main.routes import main
+    from web_app.errors.handlers import errors
+    
+    app.register_blueprint(main)
+    app.register_blueprint(errors)
+
+    return app

web_app/config.py

@@ -0,0 +1,2 @@
+class Config():
+    SECRET_KEY = '4542bae72a9fefada779b8c3fc68a826'

web_app/errors/handlers.py

@@ -0,0 +1,23 @@
+from flask import Blueprint, render_template
+
+errors = Blueprint('errors', __name__)
+
+@errors.app_errorhandler(404)
+def error_404(error):
+    return render_template('errors/404.html'), 404
+
+@errors.app_errorhandler(403)
+def error_403(error):
+    return render_template('errors/403.html'), 403
+
+@errors.app_errorhandler(500)
+def error_500(error):
+    return render_template('errors/500.html'), 500
+
+@errors.app_errorhandler(418)
+def error_600(error):
+    return render_template('errors/418.html'), 418
+
+@errors.app_errorhandler(501)
+def error_600(error):
+    return render_template('errors/512.html'), 501

web_app/main/forms.py

@@ -0,0 +1,12 @@
+from flask_wtf import FlaskForm
+from wtforms import FileField, SubmitField
+from wtforms.validators import Optional
+from flask_wtf.file import FileAllowed
+from wtforms.fields.core import StringField
+
+class UploadJavaForm(FlaskForm):
+    comments = StringField('Enter customn comments (//, #, ...): ', validators=(Optional()))
+    types = StringField('custom types (//, #, ...)', validators=(Optional()))
+    remove_tags = StringField('Enter customn modifier (public, private, ...): ', validators=(Optional()))
+    java = FileField('.java hochladen', validators=[FileAllowed(['java', 'txt'])])
+    submit = SubmitField('Bestätigen')

web_app/main/routes.py

@@ -0,0 +1,86 @@
+from flask.helpers import send_file
+from flask import render_template, abort, flash, Blueprint
+from web_app.main.forms import UploadJavaForm
+from random import randint
+import shutil
+import secrets
+import os
+import logging
+
+from gui.utils import nassi
+from interpreter.NassiShneidermann import NassiShneidermanDiagram, OB
+
+main = Blueprint('main', __name__)
+
+def deleteFilesInFolder(path):
+    file_list = os.listdir(path)
+    for f in file_list:
+        try:
+            os.remove(path + '/' +f)
+            # print("remove " + f)
+        except:
+            try:
+                shutil.rmtree(path + '/' + f)
+                # print("remove " + f)
+            except:
+                logging.error("fail to remove " + f)
+
+
+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) )
+            output_path_zip = os.path.join(os.path.abspath(os.path.join('Web', os.pardir)), f'./tmp/output/{outputname}')
+
+            behaviour = OB.RANDOM_NAME 
+
+
+               
+            deleteFilesInFolder(str(os.path.join(os.path.abspath(os.path.join('Web', os.pardir)), './tmp/output/')))
+            NSD = NassiShneidermanDiagram(True)
+            output_directory = output_path + '/' + outputname
+            
+            
+            try:
+               if not os.path.exists(output_directory):
+                    os.makedirs(output_directory)
+            except OSError:
+                logging.error('Error: Creating directory. ' +  output_directory)
+
+
+            custom_tags = {"comments" : form.comments.data, "ignore" : form.remove_tags.data, "types" : form.types.data}
+            
+            NSD.load_from_file(input_path, custom_tags)
+            NSD.convert_to_image(output_directory, on_conflict=behaviour)
+
+            shutil.make_archive(output_path_zip, 'zip', output_directory) 
+            
+            deleteFilesInFolder(output_path)
+            return send_file(output_path_zip + '.zip', as_attachment=True)
+            
+            
+
+    return render_template('upload.html', title='Upload', legend='Upload', form=form )
+
+@main.route('/working', methods=['POST', 'GET'])
+def working():
+    abort(501)

web_app/static/main.css

@@ -0,0 +1,90 @@
+
+body {
+color: #ffffff;
+margin-top: 5rem;
+}
+
+h1, h2, h3, h4, h5, h6 {
+color: #ffffff;
+}
+
+.black-text {
+    color: #000000;
+}
+
+.bg-steel {
+background-color: #49484d;
+}
+
+.site-header .navbar-nav .nav-link {
+color: #cbd5db;
+}
+
+.site-header .navbar-nav .nav-link:hover {
+color: #ffffff;
+}
+
+.site-header .navbar-nav .nav-link.active {
+font-weight: 500;
+}
+
+.content-section {
+background: #444444;
+padding: 10px 20px;
+border: 10px solid #444455;
+border-style: groove;
+border-radius: 30px 1px 30px 1px;
+margin-bottom: 20px;
+}
+
+.article-title {
+color: #ffffff;
+}
+
+a.article-title:hover {
+color: #428bca;
+text-decoration: none;
+}
+
+.article-content {
+white-space: pre-line;
+color: aliceblue;
+}
+
+.article-img {
+height: 65px;
+width: 65px;
+margin-right: 16px;
+}
+
+.article-metadata {
+padding-bottom: 1px;
+margin-bottom: 4px;
+border-bottom: 1px solid #ffffff
+}
+
+.article-metadata a:hover {
+color: #ffffff;
+text-decoration: none;
+}
+
+.article-svg {
+width: 25px;
+height: 25px;
+vertical-align: middle;
+}
+
+.account-img {
+height: 125px;
+width: 125px;
+margin-right: 20px;
+margin-bottom: 16px;
+}
+
+.account-heading {
+font-size: 2.5rem;
+}
+
+.label-filter {
+    color: #291852;
+}

web_app/templates/datenschutz.html

@@ -0,0 +1,7 @@
+{% extends 'layout.html' %}
+{% block content %}
+    <head><meta http-equiv="refresh" content="2; URL=https://ole-siepmann.de/startseite/datenschutzerklaerung/"></head>
+    <h1 class="black-text">Datenschutz</h1>
+    <h5 class="black-text">Sie werden jeden Moment weitergeleitet!</h5>
+    <p class="black-text">Falls dies nicht der Fall ist, hier die Zieladresse https://ole-siepmann.de/startseite/datenschutzerklaerung/ an die Sie weitergeleitet werden.</p>
+{% endblock content %}

web_app/templates/errors/403.html

@@ -0,0 +1,7 @@
+{% extends 'layout.html' %}
+{% block content %}
+<div class="content-section">
+    <h1>Fehler 403</h1>
+    <h5>Oops. Das dürfen Sie nicht!</h5>
+</div>
+{% endblock content %}

web_app/templates/errors/404.html

@@ -0,0 +1,8 @@
+{% extends 'layout.html' %}
+{% block content %}
+<div class="content-section">
+    <h1>Fehler 404</h1>
+    <h5>Oops. Diese Seite existiert nicht</h5>
+    <p>Hier gibt es nichts zusehen, suchen Sie an einem anderen Ort!</p>
+</div>
+{% endblock content %}

web_app/templates/errors/418.html

@@ -0,0 +1,8 @@
+{% extends 'layout.html' %}
+{% block content %}
+<div class="content-section">
+    <h1>Funktion nicht fertig.</h1>
+    <h5>Oops. Ole hat diese Funktion der Webseite noch nicht fertig gestellt.</h5>
+    <p>Versuch es in Zukunft nochmal oder frag Ole, wie lange er für diese Funktion noch brauch. Wenn du einen Verbesserungsvorschlag hast, melde dich bei Ole.</p>
+</div>
+{% endblock content %}

web_app/templates/errors/500.html

@@ -0,0 +1,8 @@
+{% extends 'layout.html' %}
+{% block content %}
+<div class="content-section">
+    <h1>Fehler 500</h1>
+    <h5>Oops. Ole oder Kons haben was falsch gemacht</h5>
+    <p>Versuch es in naher Zukunft nochmal.</p>
+</div>
+{% endblock content %}

web_app/templates/errors/501.html

@@ -0,0 +1,8 @@
+{% extends 'layout.html' %}
+{% block content %}
+<div class="content-section">
+    <h1>Die Seite wird gerade überarbeitet</h1>
+    <h5>Gedult!</h5>
+    <p>Hier gibt es nichts zusehen!</p>
+</div>
+{% endblock content %}

web_app/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="{{ url_for('static', filename='main.css') }}">
+
+    {% 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="http://nassi.ole-siepmann.de">Home</a>
+                <a class="nav-item nav-link" href="https://ole-siepmann.de/startseite/datenschutzerklaerung/">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>

web_app/templates/upload.html

@@ -0,0 +1,33 @@
+{% extends 'layout.html' %}
+{% block content %}
+    <div class="content-section">
+        {{ form.hidden_tag() }}
+        <div class="media">
+            <div class="media-body">
+                <p>WARNING Because the Interpreter is still WIP, some Java language features are not supported. These include:
+                    *foreach loops (will throw JavaSyntaxError)
+                    *constructors (will be ignored)
+                    *switch statements
+                Please remove these features from the source code as they will result in incorrect behaviour</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 Datei 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 %}