From 6c3d0e8f6ee51452615ac9f45521656500cbdd6f Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Tue, 23 May 2023 20:42:26 -0500 Subject: [PATCH] Rename get_formats to get_output_formats for engines --- lib/render_workers/aerender_worker.py | 2 +- lib/render_workers/blender_worker.py | 4 ++-- lib/render_workers/ffmpeg_worker.py | 9 +-------- lib/render_workers/render_worker.py | 4 ++-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/render_workers/aerender_worker.py b/lib/render_workers/aerender_worker.py index 129ef67..1197ef2 100644 --- a/lib/render_workers/aerender_worker.py +++ b/lib/render_workers/aerender_worker.py @@ -34,7 +34,7 @@ class AERender(BaseRenderEngine): return version @classmethod - def get_formats(cls): + def get_output_formats(cls): # todo: create implementation return [] diff --git a/lib/render_workers/blender_worker.py b/lib/render_workers/blender_worker.py index 3688c00..83abb40 100644 --- a/lib/render_workers/blender_worker.py +++ b/lib/render_workers/blender_worker.py @@ -22,7 +22,7 @@ class Blender(BaseRenderEngine): return version @classmethod - def get_formats(cls): + def get_output_formats(cls): format_string = cls.get_help().split('Format Options')[-1].split('Animation Playback Options')[0] formats = re.findall(r"'([A-Z_0-9]+)'", format_string) return formats @@ -218,7 +218,7 @@ if __name__ == '__main__': print(Blender.full_report()) - # x = pack_blender_files('/Users/brett/Blender Files/temple_animatic.blend') + x = Blender.pack_project_file('/Users/brettwilliams/Downloads/barbershop_interior.blend') # print(x) # logging.basicConfig(format='%(asctime)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S', level=logging.DEBUG) diff --git a/lib/render_workers/ffmpeg_worker.py b/lib/render_workers/ffmpeg_worker.py index 33ecdf8..b788e0b 100644 --- a/lib/render_workers/ffmpeg_worker.py +++ b/lib/render_workers/ffmpeg_worker.py @@ -25,19 +25,12 @@ class FFMPEG(BaseRenderEngine): return encoders @classmethod - def get_formats(cls): + def get_output_formats(cls): formats_raw = subprocess.check_output([cls.renderer_path(), '-formats'], stderr=subprocess.DEVNULL).decode('utf-8') pattern = '(?P[DE]{1,2})\s+(?P\S{2,})\s+(?P.*)' formats = [m.groupdict() for m in re.finditer(pattern, formats_raw)] return formats - @classmethod - def full_report(cls): - return {'version': cls.version(), - 'help_text': cls.get_help(), - 'encoders': cls.get_encoders(), - 'formats': cls.get_formats()} - class FFMPEGRenderWorker(BaseRenderWorker): diff --git a/lib/render_workers/render_worker.py b/lib/render_workers/render_worker.py index f855ef8..0012f3e 100644 --- a/lib/render_workers/render_worker.py +++ b/lib/render_workers/render_worker.py @@ -253,8 +253,8 @@ class BaseRenderEngine(object): return help_doc @classmethod - def get_formats(cls): - raise NotImplementedError("get_formats not implemented") + def get_output_formats(cls): + raise NotImplementedError(f"get_output_formats not implemented for {cls.__name__}") class RenderWorkerFactory: