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

Fixed saving / loading render status states

Browse Source
This commit is contained in:
Brett Williams
2023-05-24 13:06:15 -05:00
parent 2a7eddb1eb
commit 8a3854a51e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/render_workers/render_worker.py
View File

@@ -20,6 +20,7 @@ class RenderStatus(Enum):
CANCELLED = "cancelled" CANCELLED = "cancelled"
ERROR = "error" ERROR = "error"
SCHEDULED = "scheduled" SCHEDULED = "scheduled"
UNDEFINED = "undefined"
def string_to_status(string): def string_to_status(string):
@@ -244,6 +245,7 @@ class BaseRenderWorker(object):
worker_data = self.__dict__.copy() worker_data = self.__dict__.copy()
worker_data['percent_complete'] = self.percent_complete() worker_data['percent_complete'] = self.percent_complete()
worker_data['time_elapsed'] = self.time_elapsed() worker_data['time_elapsed'] = self.time_elapsed()
worker_data['status'] = self.status.value
keys_to_remove = ['thread', 'process'] # remove unwanted keys from dict keys_to_remove = ['thread', 'process'] # remove unwanted keys from dict
for key in worker_data.keys(): for key in worker_data.keys():
if key.startswith('_'): if key.startswith('_'):

10
lib/scheduled_job.py
View File

@@ -81,12 +81,14 @@ class ScheduledJob(Base):
def render_status(self): def render_status(self):
try: try:
if self.scheduled_start and self.worker_object.status == RenderStatus.NOT_STARTED: worker_status = RenderStatus(self.worker_data()['status'])
if self.scheduled_start and worker_status == RenderStatus.NOT_STARTED:
return RenderStatus.SCHEDULED return RenderStatus.SCHEDULED
else: else:
return self.worker_object.status return worker_status
except: except Exception as e:
return RenderStatus.CANCELLED logger.error(f"Exception fetching render status: {e}")
return RenderStatus.UNDEFINED
def json(self): def json(self):
"""Converts RenderJob into JSON-friendly dict""" """Converts RenderJob into JSON-friendly dict"""