diff --git a/.gitignore b/.gitignore index 08e8fd8..9034413 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*.db __pycache__ +generated metadatum venv diff --git a/Makefile b/Makefile index a8b035d..b5023e7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ default: run run: - FLASK_ENV=development FLASK_APP=app flask run + @mkdir -p metadatum generated && \ + FLASK_ENV=development FLASK_APP=app flask run diff --git a/app.py b/app.py index 02e1033..4cc5cf2 100644 --- a/app.py +++ b/app.py @@ -5,6 +5,7 @@ from flask import Flask, redirect, render_template, url_for from flask_wtf import FlaskForm from flask_wtf.csrf import CSRFProtect from flask_wtf.file import FileAllowed, FileField, FileRequired +from temp_index import make_cards from werkzeug.utils import secure_filename from wtforms import RadioField, StringField from wtforms.validators import DataRequired @@ -46,19 +47,14 @@ def upload(): if upload_form.validate_on_submit(): f = upload_form.metadata.data filename = secure_filename(f.filename) - f.save(os.path.join(CWD, "metadatum", filename)) - return redirect(url_for("home")) - - return render_template("index.html", upload_form=upload_form) - - -@app.route("/generate", methods=["POST"]) -def generate(): - upload_form = UploadForm() - - if upload_form.validate_on_submit(): - # pass some sort of condition to render_template to sort out the frame - # render - pass + metadata_fpath = os.path.join(CWD, "metadatum", filename) + f.save(metadata_fpath) + + pdf = os.path.join(CWD, "generated", "test.pdf") + metadata = "sqlite:///{}".format(os.path.join(CWD, "metadatum", filename)) + make_cards( + pdf, metadata, ["title", "timestamp", "comments", "authors"], ["tags"] + ) + return render_template("index.html", upload_form=upload_form, pdf=pdf) return render_template("index.html", upload_form=upload_form) diff --git a/templates/index.html b/templates/index.html index f5cbfa8..93ed6e5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -40,5 +40,10 @@ {% endif %} + + {% if pdf %} +

FOOOO

+ {% endif %} +