From f9c114bf32cf8ae49a3856bba039bef38b9c7b15 Mon Sep 17 00:00:00 2001
From: Brett Williams <blw1138@mac.com>
Date: Sun, 4 Aug 2024 10:00:16 -0500
Subject: [PATCH] Add UI options for aerender

---
 src/engines/aerender/aerender_engine.py      | 9 +++++++++
 src/engines/aerender/aerender_ui.py          | 8 ++++++++
 src/engines/aerender/aerender_worker.py      | 6 +++---
 src/engines/blender/blender_engine.py        | 6 +++---
 src/engines/blender/scripts/get_file_info.py | 4 ++--
 src/engines/core/base_engine.py              | 8 ++++----
 src/engines/ffmpeg/ffmpeg_engine.py          | 8 ++++----
 src/engines/ffmpeg/ffmpeg_ui.py              | 2 +-
 src/ui/add_job.py                            | 2 +-
 9 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 src/engines/aerender/aerender_ui.py

diff --git a/src/engines/aerender/aerender_engine.py b/src/engines/aerender/aerender_engine.py
index b16f100..24f330c 100644
--- a/src/engines/aerender/aerender_engine.py
+++ b/src/engines/aerender/aerender_engine.py
@@ -59,6 +59,15 @@ class AERender(BaseRenderEngine):
         # todo: create implementation
         return []
 
+    def ui_options(self, project_info):
+        from src.engines.aerender.aerender_ui import AERenderUI
+        return AERenderUI.get_options(self, project_info)
+
+    @classmethod
+    def worker_class(cls):
+        from src.engines.aerender.aerender_worker import AERenderWorker
+        return AERenderWorker
+
 
 if __name__ == "__main__":
     x = AERender().get_project_info('/Users/brett/ae_testing/project.aepx')
diff --git a/src/engines/aerender/aerender_ui.py b/src/engines/aerender/aerender_ui.py
new file mode 100644
index 0000000..efc7dce
--- /dev/null
+++ b/src/engines/aerender/aerender_ui.py
@@ -0,0 +1,8 @@
+
+class AERenderUI:
+    @staticmethod
+    def get_options(instance, project_info):
+        options = [
+            {'name': 'comp', 'options': project_info.get('comp_names', [])}
+        ]
+        return options
\ No newline at end of file
diff --git a/src/engines/aerender/aerender_worker.py b/src/engines/aerender/aerender_worker.py
index 784c5a6..7797ab8 100644
--- a/src/engines/aerender/aerender_worker.py
+++ b/src/engines/aerender/aerender_worker.py
@@ -71,7 +71,7 @@ class AERenderWorker(BaseRenderWorker):
             self.total_frames = timecode_to_frames(duration_string.split('Duration:')[-1], float(frame_rate))
 
         match = re.match(r'PROGRESS:.*\((?P<frame>\d+)\): (?P<time>\d+)', line).groupdict()
-        self.last_frame = match['frame']
+        self.current_frame = match['frame']
 
     def average_frame_duration(self):
 
@@ -82,12 +82,12 @@ class AERenderWorker(BaseRenderWorker):
             if match:
                 total_durations += int(match.group(2))
 
-        average = float(total_durations) / self.last_frame
+        average = float(total_durations) / self.current_frame
         return average
 
     def percent_complete(self):
         if self.total_frames:
-            return (float(self.last_frame) / float(self.total_frames)) * 100
+            return (float(self.current_frame) / float(self.total_frames)) * 100
         else:
             return 0
 
diff --git a/src/engines/blender/blender_engine.py b/src/engines/blender/blender_engine.py
index 8a817c8..f04b0cc 100644
--- a/src/engines/blender/blender_engine.py
+++ b/src/engines/blender/blender_engine.py
@@ -18,12 +18,12 @@ class Blender(BaseRenderEngine):
         from src.engines.blender.blender_downloader import BlenderDownloader
         return BlenderDownloader
 
-    @staticmethod
-    def worker_class():
+    @classmethod
+    def worker_class(cls):
         from src.engines.blender.blender_worker import BlenderRenderWorker
         return BlenderRenderWorker
 
-    def ui_options(self):
+    def ui_options(self, project_info):
         from src.engines.blender.blender_ui import BlenderUI
         return BlenderUI.get_options(self)
 
diff --git a/src/engines/blender/scripts/get_file_info.py b/src/engines/blender/scripts/get_file_info.py
index 614b636..082feed 100644
--- a/src/engines/blender/scripts/get_file_info.py
+++ b/src/engines/blender/scripts/get_file_info.py
@@ -19,8 +19,8 @@ for cam_obj in bpy.data.cameras:
 
 data = {'cameras':  cameras,
         'engine': scene.render.engine,
-        'frame_start': scene.frame_start,
-        'frame_end': scene.frame_end,
+        'start_frame': scene.frame_start,
+        'end_frame': scene.frame_end,
         'resolution_x': scene.render.resolution_x,
         'resolution_y': scene.render.resolution_y,
         'resolution_percentage': scene.render.resolution_percentage,
diff --git a/src/engines/core/base_engine.py b/src/engines/core/base_engine.py
index c1bc0ed..0c88b12 100644
--- a/src/engines/core/base_engine.py
+++ b/src/engines/core/base_engine.py
@@ -47,11 +47,11 @@ class BaseRenderEngine(object):
     def downloader():  # override when subclassing if using a downloader class
         return None
 
-    @staticmethod
-    def worker_class():  # override when subclassing to link worker class
-        raise NotImplementedError("Worker class not implemented")
+    @classmethod
+    def worker_class(cls):  # override when subclassing to link worker class
+        raise NotImplementedError(f"Worker class not implemented for engine {cls.name()}")
 
-    def ui_options(self):  # override to return options for ui
+    def ui_options(self, project_info):  # override to return options for ui
         return {}
 
     def get_help(self):  # override if renderer uses different help flag
diff --git a/src/engines/ffmpeg/ffmpeg_engine.py b/src/engines/ffmpeg/ffmpeg_engine.py
index c9da9f1..8800db5 100644
--- a/src/engines/ffmpeg/ffmpeg_engine.py
+++ b/src/engines/ffmpeg/ffmpeg_engine.py
@@ -12,14 +12,14 @@ class FFMPEG(BaseRenderEngine):
         from src.engines.ffmpeg.ffmpeg_downloader import FFMPEGDownloader
         return FFMPEGDownloader
 
-    @staticmethod
-    def worker_class():
+    @classmethod
+    def worker_class(cls):
         from src.engines.ffmpeg.ffmpeg_worker import FFMPEGRenderWorker
         return FFMPEGRenderWorker
 
-    def ui_options(self):
+    def ui_options(self, project_info):
         from src.engines.ffmpeg.ffmpeg_ui import FFMPEGUI
-        return FFMPEGUI.get_options(self)
+        return FFMPEGUI.get_options(self, project_info)
 
     @classmethod
     def supported_extensions(cls):
diff --git a/src/engines/ffmpeg/ffmpeg_ui.py b/src/engines/ffmpeg/ffmpeg_ui.py
index a04a56f..d1945a3 100644
--- a/src/engines/ffmpeg/ffmpeg_ui.py
+++ b/src/engines/ffmpeg/ffmpeg_ui.py
@@ -1,5 +1,5 @@
 class FFMPEGUI:
     @staticmethod
-    def get_options(instance):
+    def get_options(instance, project_info):
         options = []
         return options
diff --git a/src/ui/add_job.py b/src/ui/add_job.py
index 0bb8ad6..da98f03 100644
--- a/src/ui/add_job.py
+++ b/src/ui/add_job.py
@@ -350,7 +350,7 @@ class NewRenderJobForm(QWidget):
             # Dynamic Engine Options
             clear_layout(self.renderer_options_layout)  # clear old options
             # dynamically populate option list
-            self.current_engine_options = engine().ui_options()
+            self.current_engine_options = engine().ui_options(self.project_info)
             for option in self.current_engine_options:
                 h_layout = QHBoxLayout()
                 label = QLabel(option['name'].replace('_', ' ').capitalize() + ':')