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

Fix issues with engine name

Browse Source
This commit is contained in:
Brett Williams
2023-05-22 19:15:02 -05:00
parent 49c138968d
commit 861df5f215
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/render_queue.py
View File

@@ -153,7 +153,7 @@ class RenderQueue:
not_started = cls.jobs_with_status(RenderStatus.NOT_STARTED, priority_sorted=True) not_started = cls.jobs_with_status(RenderStatus.NOT_STARTED, priority_sorted=True)
if not_started: if not_started:
for job in not_started: for job in not_started:
renderer = job.worker.engine.name renderer = job.worker.engine.name()
higher_priority_jobs = [x for x in cls.running_jobs() if x.priority < job.priority] higher_priority_jobs = [x for x in cls.running_jobs() if x.priority < job.priority]
max_renderers = renderer in instances.keys() and instances[ max_renderers = renderer in instances.keys() and instances[
renderer] >= cls.maximum_renderer_instances.get(renderer, 1) renderer] >= cls.maximum_renderer_instances.get(renderer, 1)
@@ -191,7 +191,7 @@ class RenderQueue:
@classmethod @classmethod
def renderer_instances(cls): def renderer_instances(cls):
from collections import Counter from collections import Counter
all_instances = [x.worker.engine.name for x in cls.running_jobs()] all_instances = [x.worker.engine.name() for x in cls.running_jobs()]
return Counter(all_instances) return Counter(all_instances)
@classmethod @classmethod

4
lib/render_workers/render_worker.py
View File

@@ -36,7 +36,7 @@ class BaseRenderWorker(object):
if not ignore_extensions: if not ignore_extensions:
if not any(ext in input_path for ext in self.engine.supported_extensions): if not any(ext in input_path for ext in self.engine.supported_extensions):
err_meg = f'Cannot find valid project with supported file extension for {self.engine.name} renderer' err_meg = f'Cannot find valid project with supported file extension for {self.engine.name()} renderer'
logger.error(err_meg) logger.error(err_meg)
raise ValueError(err_meg) raise ValueError(err_meg)
if not self.engine: if not self.engine:
@@ -116,7 +116,7 @@ class BaseRenderWorker(object):
return return
self.status = RenderStatus.RUNNING self.status = RenderStatus.RUNNING
logger.info('Starting {0} {1} Render for {2}'.format(self.renderer, self.version(), self.input_path)) logger.info(f'Starting {self.engine.name()} {self.engine.version()} Render for {self.input_path}')
self.__thread.start() self.__thread.start()
def run(self): def run(self):

11
lib/server/job_server.py
View File

@@ -427,11 +427,12 @@ def status():
def renderer_info(): def renderer_info():
renderer_data = {} renderer_data = {}
for r in RenderWorkerFactory.supported_renderers(): for r in RenderWorkerFactory.supported_renderers():
renderer_class = RenderWorkerFactory.class_for_name(r) engine = RenderWorkerFactory.class_for_name(r).engine
renderer_data[r] = {'available': renderer_class.renderer_path() is not None, renderer_data[r] = {'available': engine.renderer_path() is not None,
'version': renderer_class.version(), 'version': engine.version(),
'supported_extensions': renderer_class.supported_extensions, 'supported_extensions': engine.supported_extensions,
'supported_export_formats': renderer_class.supported_export_formats} 'supported_export_formats': engine.get_formats(),
'path': engine.renderer_path()}
return renderer_data return renderer_data