brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2026-02-05 13:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved project naming and fixed Blender engine issue

Browse Source
This commit is contained in:
Brett Williams
2026-01-04 20:05:49 -06:00
parent 7b0d9a0b9f
commit a036b8244f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/api_server.py
View File

@@ -309,6 +309,12 @@ def add_job_handler():
new_job = DistributedJobManager.create_render_job(processed_job_data, loaded_project_local_path) new_job = DistributedJobManager.create_render_job(processed_job_data, loaded_project_local_path)
created_jobs.append(new_job) created_jobs.append(new_job)
# Save notes to .txt
if processed_job_data.get("notes"):
parent_dir = os.path.dirname(os.path.dirname(loaded_project_local_path))
notes_name = processed_job_data['name'] + "-notes.txt"
with open(os.path.join(parent_dir, notes_name), "w") as f:
f.write(processed_job_data["notes"])
return [x.json() for x in created_jobs] return [x.json() for x in created_jobs]
except Exception as e: except Exception as e:
logger.exception(f"Error creating render job: {e}") logger.exception(f"Error creating render job: {e}")

4
src/api/job_import_handler.py
View File

@@ -43,9 +43,9 @@ class JobImportHandler:
raise FileNotFoundError("Cannot find any valid project paths") raise FileNotFoundError("Cannot find any valid project paths")
# Prepare the local filepath # Prepare the local filepath
cleaned_path_name = os.path.splitext(referred_name)[0].replace(' ', '-') cleaned_path_name = job_name.replace(' ', '-')
job_dir = os.path.join(upload_directory, '-'.join( job_dir = os.path.join(upload_directory, '-'.join(
[datetime.now().strftime("%Y.%m.%d_%H.%M.%S"), engine_name, cleaned_path_name])) [cleaned_path_name, engine_name, datetime.now().strftime("%Y.%m.%d_%H.%M.%S")]))
os.makedirs(job_dir, exist_ok=True) os.makedirs(job_dir, exist_ok=True)
project_source_dir = os.path.join(job_dir, 'source') project_source_dir = os.path.join(job_dir, 'source')
os.makedirs(project_source_dir, exist_ok=True) os.makedirs(project_source_dir, exist_ok=True)

2
src/engines/blender/blender_engine.py
View File

@@ -164,7 +164,7 @@ class Blender(BaseRenderEngine):
return options return options
def system_info(self): def system_info(self):
return {'render_devices': self.get_render_devices()} return {'render_devices': self.get_render_devices(), 'engines': self.supported_render_engines()}
def get_render_devices(self): def get_render_devices(self):
script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'scripts', 'get_system_info.py') script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'scripts', 'get_system_info.py')