mirror of
https://github.com/blw1138/Zordon.git
synced 2025-12-17 16:58:12 +00:00
Remove all references to ScheduledJob
This commit is contained in:
@@ -31,7 +31,7 @@ def string_to_status(string):
|
||||
for stat in RenderStatus:
|
||||
if stat.value == string:
|
||||
return stat
|
||||
return RenderStatus.ERROR
|
||||
return RenderStatus.UNDEFINED
|
||||
|
||||
|
||||
class BaseRenderWorker(Base):
|
||||
@@ -41,6 +41,8 @@ class BaseRenderWorker(Base):
|
||||
input_path = Column(String)
|
||||
output_path = Column(String)
|
||||
date_created = Column(DateTime)
|
||||
start_time = Column(DateTime)
|
||||
end_time = Column(DateTime)
|
||||
renderer = Column(String)
|
||||
renderer_version = Column(String)
|
||||
priority = Column(Integer)
|
||||
@@ -48,6 +50,7 @@ class BaseRenderWorker(Base):
|
||||
client = Column(String)
|
||||
name = Column(String)
|
||||
file_hash = Column(String)
|
||||
_status = Column(String)
|
||||
|
||||
engine = None
|
||||
|
||||
@@ -97,6 +100,18 @@ class BaseRenderWorker(Base):
|
||||
self.is_finished = False
|
||||
self.last_output = None
|
||||
|
||||
@property
|
||||
def status(self):
|
||||
return self._status
|
||||
|
||||
@status.setter
|
||||
def status(self, value):
|
||||
self._status = value.value
|
||||
|
||||
@status.getter
|
||||
def status(self):
|
||||
return string_to_status(self._status)
|
||||
|
||||
def validate(self):
|
||||
if not os.path.exists(self.input_path):
|
||||
raise FileNotFoundError(f"Cannot find input path: {self.input_path}")
|
||||
@@ -285,6 +300,9 @@ class BaseRenderWorker(Base):
|
||||
worker_data['percent_complete'] = self.percent_complete()
|
||||
worker_data['time_elapsed'] = self.time_elapsed()
|
||||
worker_data['status'] = self.status.value
|
||||
worker_data['renderer'] = self.renderer
|
||||
worker_data['name'] = self.name
|
||||
worker_data['renderer_version'] = self.renderer_version
|
||||
keys_to_remove = ['thread', 'process'] # remove unwanted keys from dict
|
||||
for key in worker_data.keys():
|
||||
if key.startswith('_'):
|
||||
|
||||
Reference in New Issue
Block a user