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

Combine add_job and upload_file methods

Browse Source
This commit is contained in:
Brett Williams
2022-10-12 17:11:27 -07:00
parent fd6af10d56
commit 2181ce54a2
8 changed files with 159 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utilities/aerender_worker.py
View File

@@ -35,12 +35,13 @@ class AERenderWorker(BaseRenderWorker):
render_engine = 'aerender'
supported_extensions = ['.aep']
def __init__(self, project, comp, render_settings, omsettings, output):
super(AERenderWorker, self).__init__(input=project, output=output)
def __init__(self, input_path, output_path, args=None):
super(AERenderWorker, self).__init__(input_path=input_path, output_path=output_path, ignore_extensions=False,
args=args)
self.comp = comp
self.render_settings = render_settings
self.omsettings = omsettings
self.comp = args.get('comp', None)
self.render_settings = args.get('render_settings', None)
self.omsettings = args.get('omsettings', None)
self.progress = 0
self.progress_history = []

3
utilities/blender_worker.py
View File

@@ -25,7 +25,8 @@ class BlenderRenderWorker(BaseRenderWorker):
install_paths = ['/Applications/Blender.app/Contents/MacOS/Blender']
def __init__(self, input_path, output_path, args=None, render_all_frames=False, engine='BLENDER_EEVEE'):
super(BlenderRenderWorker, self).__init__(input_path=input_path, output_path=output_path, args=args)
super(BlenderRenderWorker, self).__init__(input_path=input_path, output_path=output_path,
ignore_extensions=False, args=args)
self.engine = engine # or 'CYCLES'
self.format = 'JPEG'

3
utilities/ffmpeg_worker.py
View File

@@ -21,7 +21,8 @@ class FFMPEGRenderWorker(BaseRenderWorker):
render_engine = 'ffmpeg'
def __init__(self, input_path, output_path, args=None):
super(FFMPEGRenderWorker, self).__init__(input_path=input_path, output_path=output_path, ignore_extensions=True, args=args)
super(FFMPEGRenderWorker, self).__init__(input_path=input_path, output_path=output_path, ignore_extensions=True,
args=args)
self.total_frames = -1
if os.path.exists(input_path):

2
utilities/render_worker.py
View File

@@ -38,7 +38,7 @@ class BaseRenderWorker(object):
def version():
return 'Unknown'
def __init__(self, input_path, output_path, args=None, ignore_extensions=False):
def __init__(self, input_path, output_path, args=None, ignore_extensions=True):
if not ignore_extensions:
if not any(ext in input_path for ext in self.supported_extensions):