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

Added new commands to index.html

Browse Source
This commit is contained in:
Brett Williams
2022-12-08 00:08:09 -08:00
parent fbaf2e3661
commit d0b14fc001
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/render_job.py
View File

@@ -58,13 +58,6 @@ class RenderJob:
for key in keys_to_remove:
job_dict['worker'].pop(key, None)
# jobs from current_session generate percent completed
# jobs after loading server pull in a saved value. Have to check if callable object or not
percent_complete = self.worker.percent_complete if isinstance(self.worker.percent_complete, numbers.Number) \
else self.worker.percent_complete()
job_dict['worker']['percent_complete'] = percent_complete
# convert to json and back to auto-convert dates to iso format
def date_serializer(o):
if isinstance(o, datetime):
@@ -105,6 +98,9 @@ class RenderJob:
def log_path(self):
return self.worker.log_path
def percent_complete(self):
return self.worker.percent_complete()
@classmethod
def generate_id(cls):
return str(uuid.uuid4()).split('-')[0]