mirror of
https://github.com/blw1138/Zordon.git
synced 2025-12-17 08:48:13 +00:00
render_queue refactoring
This commit is contained in:
@@ -25,7 +25,7 @@ class JobNotFoundError(Exception):
|
||||
class RenderQueue:
|
||||
job_queue = []
|
||||
render_clients = []
|
||||
maximum_renderer_instances = {'Blender': 2, 'After Effects': 1, 'ffmpeg': 4}
|
||||
maximum_renderer_instances = {'blender': 2, 'aerender': 1, 'ffmpeg': 4}
|
||||
host_name = None
|
||||
port = 8080
|
||||
client_mode = False
|
||||
@@ -153,7 +153,7 @@ class RenderQueue:
|
||||
not_started = cls.jobs_with_status(RenderStatus.NOT_STARTED, priority_sorted=True)
|
||||
if not_started:
|
||||
for job in not_started:
|
||||
renderer = job.worker.renderer
|
||||
renderer = job.worker.engine.name
|
||||
higher_priority_jobs = [x for x in cls.running_jobs() if x.priority < job.priority]
|
||||
max_renderers = renderer in instances.keys() and instances[
|
||||
renderer] >= cls.maximum_renderer_instances.get(renderer, 1)
|
||||
@@ -191,7 +191,7 @@ class RenderQueue:
|
||||
@classmethod
|
||||
def renderer_instances(cls):
|
||||
from collections import Counter
|
||||
all_instances = [x.worker.renderer for x in cls.running_jobs()]
|
||||
all_instances = [x.worker.engine.name for x in cls.running_jobs()]
|
||||
return Counter(all_instances)
|
||||
|
||||
@classmethod
|
||||
|
||||
Reference in New Issue
Block a user