Pārlūkot izejas kodu

debug mode off, made two separate uploads instead of one

StepanKuklis 6 gadi atpakaļ
vecāks
revīzija
765554e6d2

+ 2 - 1
config.py

@@ -1,10 +1,11 @@
 import os
 _basedir = os.path.abspath(os.path.dirname(__file__))
 
-DEBUG = True
+DEBUG = False
 
 # Keys are used for csrf and cookies encryption
 WTF_CSRF_SECRET_KEY = 'xQM3hdzEakvBY3OaSnH5H3&$'
 SECRET_KEY = 'hn3HF1Cs$m3GqRbYyts!hRB5'
 
 ADMINS = frozenset(['sk@avtg.cz'])
+MAX_CONTENT_LENGTH = 128 * 1024 * 1024

+ 2 - 2
sesivacka.wsgi

@@ -1,7 +1,7 @@
 import sys
 import site
 
-PROJECT_NAME = 'pdf_joiner'
+PROJECT_NAME = 'sesivacka'
 
 PYTHON_VERSION = 'python{major}.{minor}'.format(
     major=sys.version_info.major,
@@ -24,4 +24,4 @@ sys.path.insert(
     PROJECT_PATH
 )
 
-from pdf_joiner import app as application
+from sesivacka import app as application

+ 2 - 2
sesivacka/__init__.py

@@ -3,7 +3,7 @@ Sesivacka
 web ui for merging pdfs
 """
 from flask import Flask
-from flask_debugtoolbar import DebugToolbarExtension
+# from flask_debugtoolbar import DebugToolbarExtension
 
 try:
     import config
@@ -24,7 +24,7 @@ def create_app(config):
     return app
 
 app = create_app(config)
-toolbar = DebugToolbarExtension(app)
+# toolbar = DebugToolbarExtension(app)
 
 from sesivacka.dashboard import dashboard_blueprint
 app.register_blueprint(dashboard_blueprint)

+ 11 - 10
sesivacka/dashboard/forms.py

@@ -1,24 +1,25 @@
 from flask_wtf import FlaskForm
 from flask_wtf.file import FileField, FileRequired, FileAllowed
-from wtforms import MultipleFileField
-from wtforms import SubmitField
+
 
 class FileForm(FlaskForm):
     """
     Pdf upload form
     """
-    files = MultipleFileField(
-        'Pdf ke spojení',
+    first_file = FileField(
+        'První pdf ke spojení',
         validators=[
-            # FileRequired(
-            #     'Nahraj PDF soubory.'
-            # ),
             FileAllowed(
                 ['pdf'], 'Pouze PDF!'
+            )
+        ]
+    )
 
+    second_file = FileField(
+        'Druhé pdf ke spojení',
+        validators=[
+            FileAllowed(
+                ['pdf'], 'Pouze PDF!'
             )
         ]
-        # render_kw={
-        #     'multiple': True
-        # }
     )

+ 6 - 1
sesivacka/dashboard/templates/dashboard.jinja.html

@@ -1,12 +1,17 @@
 {% extends "base.jinja.html" %}
 {% block title %}{% endblock %}
+{% block navbar %}{% endblock %}
 {% block body %}
 <H1>Sešij PDF</H1>
 {% from "formhelpers.jinja.html" import render_field, render_panel_field %}
     <form class="form" method="post" action="/" enctype="multipart/form-data">
         {{ form.csrf_token }}
         <div>
-            {{ render_field(form.files) }}
+            {{ render_field(form.first_file) }}
+        </div>
+        <div class="help-block"></div>
+                <div>
+            {{ render_field(form.second_file) }}
         </div>
         <div class="help-block"></div>
         <button type="submit" name="submit">

+ 5 - 8
sesivacka/dashboard/views.py

@@ -25,14 +25,11 @@ def index():
     """
     form = FileForm()
     if form.validate_on_submit():
-        output = BytesIO()
         pdf_writer = PdfFileWriter()
-        # files = request.files.getlist(form.files.name)
-        # uploaded_files = request.files.getlist('files')
-        # flash(bool(uploaded_files))
-        # flash(bool(uploaded_files))
-        # flash(bool(uploaded_files[0]))
-        for pdf_stream in request.files.getlist('files'):
+        files = []
+        for item in ('first_file', 'second_file'):
+            files.extend(request.files.getlist(item))
+        for pdf_stream in files:
                 pdf_reader = PdfFileReader(pdf_stream)
                 flash(pdf_reader.getDocumentInfo())
                 for page in range(pdf_reader.getNumPages()):
@@ -46,7 +43,7 @@ def index():
             pdf,
             mimetype='application/pdf',
             as_attachment=True,
-            attachment_filename='sesito.pdf'
+            attachment_filename=files[0].filename
         )
 
 

+ 2 - 2
sesivacka/templates/base.jinja.html

@@ -7,14 +7,14 @@
     <link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
 
     <link href="{{ url_for('static', filename='css/starter-template.css') }}" rel="stylesheet">
-    <script src="{{ url_for('static', filename='js/jquery-3.3.1.slim.min.js') }}"></script>
+<!--    <script src="{{ url_for('static', filename='js/jquery-3.3.1.slim.min.js') }}"></script>-->
     {% block head %}
     {% endblock %}
   </head>
   <body>
 
     <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
-      <a class="navbar-brand" href="/chart_settings">Bvisualiser</a>
+      <a class="navbar-brand" href="/chart_settings">Sešívačka</a>
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
               aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>