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

API cleanup

Browse Source
This commit is contained in:
Brett Williams
2023-05-28 01:17:10 -05:00
parent bac069201f
commit 4911ed538d
4 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/scheduled_job.py
View File

@@ -100,6 +100,7 @@ class ScheduledJob(Base):
"""Converts RenderJob into JSON-friendly dict"""
job_dict = None
try:
worker_data = self.worker_data()
job_dict = {
'id': self.id,
'name': self.name,
@@ -111,13 +112,17 @@ class ScheduledJob(Base):
'notify': self.notify,
'date_created': self.date_created,
'scheduled_start': self.scheduled_start,
'start_time': worker_data.get('start_time', None),
'status': self.render_status().value,
'time_elapsed': self.worker_data().get('time_elapsed', None),
'time_elapsed': worker_data.get('time_elapsed', None),
'file_hash': self.file_hash,
'percent_complete': self.worker_data().get('percent_complete', None),
'file_list': self.file_list(),
'percent_complete': worker_data.get('percent_complete', None),
'file_count': len(self.file_list()),
'renderer': self.renderer,
'worker': self.worker_data(),
'renderer_version': worker_data.get('renderer_version', None),
'errors': worker_data.get('errors', []),
'total_frames': worker_data.get('total_frames', -1),
'last_output': worker_data.get('last_output', None)
}
# convert to json and back to auto-convert dates to iso format