diff --git a/__pycache__/app.cpython-37.pyc b/__pycache__/app.cpython-37.pyc index 2439b5f..2aec249 100644 Binary files a/__pycache__/app.cpython-37.pyc and b/__pycache__/app.cpython-37.pyc differ diff --git a/app.py b/app.py index 9357173..b386d7d 100644 --- a/app.py +++ b/app.py @@ -20,7 +20,7 @@ app.config['BASIC_AUTH_PASSWORD'] = 'tentacles' basic_auth = BasicAuth(app) -app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER +app.config['UPLOAD_FOLDER'] = "static/pdf" @app.route('/', methods=['GET', 'POST']) @@ -28,34 +28,48 @@ app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER def run_script(): # the code below was made in case I was using a button upload but now I use the field input so this has to be uploaded and then transformed if request.method == 'POST': + # download PDF from url + file = request.form['file'] + if file: + uploadfilepath=os.path.join(app.config['UPLOAD_FOLDER'], file) + file.save(uploadfilepath) + return redirect(url_for('uploaded_file',file=file)) + # url = request.form['url'] + #if not url: + # flash('Url is required!') + # else: + # messages.append({'url': url}) + # return redirect(url_for('index')) + # check if the post request has the file part - if 'file' not in request.files: - flash('No file part') - return redirect(request.url) - file = request.files['file'] + #if 'file' not in request.files: + # flash('No file part') + # return redirect(request.url) + #file = request.files['file'] # if user does not select file, browser also # submit an empty part without filename - if file.filename == '': - flash('No selected file') - return redirect(request.url) - if file and allowed_file(file.filename): - filename = secure_filename(file.filename) - uploadfilepath=os.path.join(app.config['UPLOAD_FOLDER'], filename) - file.save(uploadfilepath) + #if file.filename == '': + # flash('No selected file') + # return redirect(request.url) + #if file and allowed_file(file.filename): + # filename = secure_filename(file.filename) + # uploadfilepath=os.path.join(app.config['UPLOAD_FOLDER'], filename) + # file.save(uploadfilepath) # return redirect(url_for('uploaded_file', # filename=filename)) - hocr_result = pdftotree.parse(uploadfilepath) - app.logger.info("test") - hocr = HocrTransform(hocr_filename=hocr_result, dpi=300) - hocr.to_pdf( - out_filename='static/pdf/output-2.pdf', - image_filename='static/images/blank.png', - show_bounding_boxes=False, - interword_spaces=False, - ) + + hocr_result = pdftotree.parse(uploadfilepath) + app.logger.info("test") + hocr = HocrTransform(hocr_filename=hocr_result, dpi=300) + hocr.to_pdf( + out_filename='static/pdf/output-2.pdf', + image_filename='static/images/blank.png', + show_bounding_boxes=False, + interword_spaces=False, + ) - hocrfile='static/hocr/gynaikoktonia.hocr' + #hocrfile='static/hocr/gynaikoktonia.hocr' #hocr = HocrTransform(hocr_filename=hocrfile, dpi=300) #hocr = HocrTransform(hocr_filename=hocr_result, dpi=300) #hocr.to_pdf( @@ -64,7 +78,7 @@ def run_script(): # show_bounding_boxes=False, # interword_spaces=False, #) - # result = subprocess.check_output("python3 hocrtransformpdf.py -i images/blank.png hocr/gynaikoktonia.hocr pdf/gynaikoktonia.pdf", shell=True) +# result = subprocess.check_output("python3 hocrtransformpdf.py -i images/blank.png hocr/gynaikoktonia.hocr pdf/gynaikoktonia.pdf", shell=True) return render_template('results.html', **locals()) diff --git a/templates/.results.html.swp b/templates/.results.html.swp new file mode 100644 index 0000000..7b655b7 Binary files /dev/null and b/templates/.results.html.swp differ diff --git a/templates/results.html b/templates/results.html index ccbe22a..ffa4be7 100644 --- a/templates/results.html +++ b/templates/results.html @@ -3,12 +3,12 @@ {% block content %} - +
@@ -16,7 +16,7 @@
-
- + @@ -48,6 +48,8 @@
+
+