From b1280ad44555137098828fdd71584068e3f51b27 Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Sat, 3 Aug 2024 21:03:01 -0500 Subject: [PATCH] Add AERender to supported_engines in EngineManager --- src/engines/engine_manager.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/engines/engine_manager.py b/src/engines/engine_manager.py index b4de73d..e7ad094 100644 --- a/src/engines/engine_manager.py +++ b/src/engines/engine_manager.py @@ -6,6 +6,7 @@ import concurrent.futures from src.engines.blender.blender_engine import Blender from src.engines.ffmpeg.ffmpeg_engine import FFMPEG +from src.engines.aerender.aerender_engine import AERender from src.utilities.misc_helper import system_safe_path, current_system_os, current_system_cpu logger = logging.getLogger() @@ -18,7 +19,7 @@ class EngineManager: @staticmethod def supported_engines(): - return [Blender, FFMPEG] + return [Blender, FFMPEG, AERender] @classmethod def engine_with_name(cls, engine_name): @@ -79,17 +80,20 @@ class EngineManager: 'type': 'system' } - with concurrent.futures.ThreadPoolExecutor() as executor: - futures = { - executor.submit(fetch_engine_details, eng): eng.name() - for eng in cls.supported_engines() - if eng.default_renderer_path() and (not filter_name or filter_name == eng.name()) - } + if not filter_name: + with concurrent.futures.ThreadPoolExecutor() as executor: + futures = { + executor.submit(fetch_engine_details, eng): eng.name() + for eng in cls.supported_engines() + if eng.default_renderer_path() + } - for future in concurrent.futures.as_completed(futures): - result = future.result() - if result: - results.append(result) + for future in concurrent.futures.as_completed(futures): + result = future.result() + if result: + results.append(result) + else: + results.append(fetch_engine_details(cls.engine_with_name(filter_name))) return results @@ -294,6 +298,6 @@ if __name__ == '__main__': # print(EngineManager.newest_engine_version('blender', 'macos', 'arm64')) # EngineManager.delete_engine_download('blender', '3.2.1', 'macos', 'a') - EngineManager.engines_path = "/Users/brettwilliams/zordon-uploads/engines" + EngineManager.engines_path = "/Users/brettwilliams/zordon-uploads/engines/" # print(EngineManager.is_version_downloaded("ffmpeg", "6.0")) print(EngineManager.get_engines())