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

Make sure supported_extensions is now called as a method everywhere

Browse Source
This commit is contained in:
Brett Williams
2023-11-16 14:01:48 -06:00
parent 9e8eb77328
commit ba996c58f5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/api_server.py
View File

@@ -423,10 +423,12 @@ def renderer_info():
# Get all installed versions of engine # Get all installed versions of engine
installed_versions = EngineManager.all_versions_for_engine(engine.name()) installed_versions = EngineManager.all_versions_for_engine(engine.name())
if installed_versions: if installed_versions:
install_path = installed_versions[0]['path'] # fixme: using system versions only because downloaded versions may have permissions issues
system_installed_versions = [x for x in installed_versions if x['type'] == 'system']
install_path = system_installed_versions[0]['path'] if system_installed_versions else installed_versions[0]['path']
renderer_data[engine.name()] = {'is_available': RenderQueue.is_available_for_job(engine.name()), renderer_data[engine.name()] = {'is_available': RenderQueue.is_available_for_job(engine.name()),
'versions': installed_versions, 'versions': installed_versions,
'supported_extensions': engine.supported_extensions, 'supported_extensions': engine.supported_extensions(),
'supported_export_formats': engine(install_path).get_output_formats()} 'supported_export_formats': engine(install_path).get_output_formats()}
return renderer_data return renderer_data

2
src/engines/core/base_worker.py
View File

@@ -47,7 +47,7 @@ class BaseRenderWorker(Base):
name=None): name=None):
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)