main #12

Merged
crunk merged 49 commits from Toolsheds/distribusi-verse:main into main 2024-07-03 13:48:57 +02:00
2 changed files with 13 additions and 7 deletions
Showing only changes of commit 098727f282 - Show all commits

View File

@ -1,3 +1,4 @@
import os
from flask import (
Blueprint,
render_template,
@ -20,6 +21,7 @@ from models.distribusi_model import Distribusis
from models.distribusi_file_model import DistribusiFiles
from describer.forms.describe_files_form import DescribeFilesForm
from describer.forms.redistribusi_form import ReDistribusiForm
from distribusikan.distribusi_workflow import run_distribusi, get_css_file
describer = Blueprint(
"describer",
@ -47,19 +49,22 @@ def show_distribusi_files(distribusiname):
)
@describer.route("/redistribusi/<string:distribusiname>")
@describer.route("/redistribusi/<string:distribusiname>", methods=["POST"])
@login_required
def re_distribusi_files(distribusiname):
distribusi = Distribusis.query.filter_by(
distribusiname=distribusiname
).first()
redistribusi_form = ReDistribusiForm()
distribusi_file_forms = get_distribusi_file_forms(distribusi.id)
return render_template(
"describe.html",
distribusiname=distribusiname,
redistribusi_form=redistribusi_form,
distribusi_file_forms=distribusi_file_forms,
if redistribusi_form.validate_on_submit():
userfolder = os.path.join("stash", distribusi.distribusiname)
cssfile = get_css_file(distribusi)
run_distribusi(userfolder, cssfile)
return redirect(
url_for(
"describer.show_distribusi_files",
distribusiname=distribusi.distribusiname,
)
)

View File

@ -96,6 +96,7 @@ def get_css_file(distribusi):
def run_distribusi(userfolder, cssfile):
print(f"Run distribusi on this folder: {userfolder} with css:{cssfile}")
parser = build_argparser()
args = parser.parse_args(["-t", "--menu-with-index", "-s", cssfile])
distribusify(args, userfolder)