+ add custom types, modifier, comments to Web Version

web_app/errors/handlers.py

@@ -18,6 +18,6 @@ def error_500(error):
 def error_600(error):
     return render_template('errors/418.html'), 418
 
-@errors.app_errorhandler(512)
+@errors.app_errorhandler(501)
 def error_600(error):
-    return render_template('errors/512.html'), 512
+    return render_template('errors/512.html'), 501

web_app/main/forms.py

@@ -1,7 +1,12 @@
+from typing import Optional
 from flask_wtf import FlaskForm
 from wtforms import FileField, SubmitField
 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

@@ -50,11 +50,9 @@ def generator():
             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}')
-            
+
-            remove_tags = None 
-            comments = None 
             behaviour = OB.RANDOM_NAME 
-            types = None
+
 
                
             deleteFilesInFolder(str(os.path.join(os.path.abspath(os.path.join('Web', os.pardir)), './tmp/output/')))
@@ -69,7 +67,7 @@ def generator():
                 logging.error('Error: Creating directory. ' +  output_directory)
 
 
-            custom_tags = {"comments" : comments, "ignore" : remove_tags, "types" : types}
+            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)
@@ -82,4 +80,7 @@ def generator():
             
 
     return render_template('upload.html', title='Upload', legend='Upload', form=form )
-    
+
+@main.route('/working', methods=['POST', 'GET'])
+def working():
+    abort(501)