brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc Cleanup

Browse Source
This commit is contained in:
Brett Williams
2022-12-11 18:01:30 -08:00
parent d1a905b805
commit 9ac22a5555
7 changed files with 58 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/job_server.py
View File

@@ -54,7 +54,8 @@ def index():
def job_detail(job_id):
found_job = RenderQueue.job_with_id(job_id)
if found_job:
table_html = json2html.json2html.convert(json=found_job.json(), table_attributes='class="table is-narrow is-striped"')
table_html = json2html.json2html.convert(json=found_job.json(),
table_attributes='class="table is-narrow is-striped"')
media_url = None
if found_job.file_list():
media_basename = os.path.basename(found_job.file_list()[0])
@@ -230,11 +231,12 @@ def add_job_handler():
elif request.form.get('json', None):
jobs_list = json.loads(request.form['json'])
else:
form_dict = dict(request.form)
# Cleanup flat form data into nested structure
form_dict = {k: v for k, v in dict(request.form).items() if v}
args = {}
arg_keys = [k for k in form_dict.keys() if '-arg_' in k]
for key in arg_keys:
if form_dict['renderer'] in key:
if form_dict['renderer'] in key or 'AnyRenderer' in key:
cleaned_key = key.split('-arg_')[-1]
args[cleaned_key] = form_dict[key]
form_dict.pop(key)
@@ -285,7 +287,6 @@ def add_job_handler():
def add_job(job_params, remove_job_dir_on_failure=False):
def remove_job_dir():
if remove_job_dir_on_failure and job_dir and os.path.exists(job_dir):
logger.debug(f"Removing job dir: {job_dir}")
@@ -298,7 +299,7 @@ def add_job(job_params, remove_job_dir_on_failure=False):
output_path = job_params.get("output_path", None)
priority = int(job_params.get('priority', 2))
args = job_params.get('args', {})
client = job_params.get('client', RenderQueue.host_name)
client = job_params.get('client', None) or RenderQueue.host_name
force_start = job_params.get('force_start', False)
custom_id = None
job_dir = None
@@ -448,4 +449,3 @@ def renderer_info():
def upload_file_page():
return render_template('upload.html', render_clients=RenderQueue.render_clients,
supported_renderers=RenderWorkerFactory.supported_renderers())