More code re-organizing

src/api/api_server.py

@@ -24,12 +24,12 @@ from werkzeug.utils import secure_filename
 from src.distributed_job_manager import DistributedJobManager
 from src.engines.engine_manager import EngineManager
 from src.render_queue import RenderQueue, JobNotFoundError
-from src.server_proxy import RenderServerProxy
+from src.api.server_proxy import RenderServerProxy
 from src.utilities.server_helper import generate_thumbnail_for_job
 from src.utilities.zeroconf_server import ZeroconfServer
 from src.utilities.misc_helper import system_safe_path
-from src.workers.worker_factory import RenderWorkerFactory
+from src.engines.core.worker_factory import RenderWorkerFactory
-from src.workers.base_worker import string_to_status, RenderStatus
+from src.engines.core.base_worker import string_to_status, RenderStatus
 
 logger = logging.getLogger()
 server = Flask(__name__, template_folder='web/templates', static_folder='web/static')

src/distributed_job_manager.py

@@ -7,7 +7,7 @@ import zipfile
 from pubsub import pub
 
 from src.render_queue import RenderQueue
-from src.server_proxy import RenderServerProxy
+from src.api.server_proxy import RenderServerProxy
 from src.utilities.misc_helper import get_file_size_human
 from src.utilities.status_utils import RenderStatus, string_to_status
 from src.utilities.zeroconf_server import ZeroconfServer

src/engines/aerender/aerender_engine.py

@@ -1,7 +1,4 @@
-try:
+from src.engines.core.base_engine import BaseRenderEngine
-    from .base_engine import *
-except ImportError:
-    from base_engine import *
 
 
 class AERender(BaseRenderEngine):

src/engines/aerender/aerender_worker.py

@@ -6,8 +6,8 @@ import os
 import re
 import time
 
-from src.workers.base_worker import BaseRenderWorker, timecode_to_frames
+from src.engines.core.base_worker import BaseRenderWorker, timecode_to_frames
-from src.engines.aerender_engine import AERender
+from src.engines.aerender.aerender_engine import AERender
 
 
 def aerender_path():

src/engines/blender/blender_downloader.py

@@ -1,11 +1,10 @@
 import logging
-import os
 import platform
 import re
 
 import requests
 
-from .downloader_core import download_and_extract_app
+from ..core.downloader_core import download_and_extract_app
 
 # url = "https://download.blender.org/release/"
 url = "https://ftp.nluug.nl/pub/graphics/blender/release/"  # much faster mirror for testing

src/engines/blender/blender_engine.py

@@ -1,10 +1,8 @@
-try:
-    from .base_engine import *
-except ImportError:
-    from base_engine import *
 import json
 import re
-import logging
+
+from src.engines.core.base_engine import *
+from src.utilities.misc_helper import system_safe_path
 
 logger = logging.getLogger()
 
@@ -58,8 +56,7 @@ class Blender(BaseRenderEngine):
     def get_scene_info(self, project_path, timeout=10):
         scene_info = {}
         try:
-            script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+            script_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'scripts', 'get_file_info.py')
-                                       'scripts', 'blender', 'get_file_info.py')
             results = self.run_python_script(project_path, system_safe_path(script_path), timeout=timeout)
             result_text = results.stdout.decode()
             for line in result_text.splitlines():

src/engines/blender/blender_worker.py

@@ -2,9 +2,9 @@
 import re
 from collections import Counter
 
-from src.engines.blender_engine import Blender
+from src.engines.blender.blender_engine import Blender
 from src.utilities.ffmpeg_helper import image_sequence_to_video
-from src.workers.base_worker import *
+from src.engines.core.base_worker import *
 
 
 class BlenderRenderWorker(BaseRenderWorker):

src/engines/core/worker_factory.py

@@ -1,5 +1,5 @@
 import logging
-from ..engines.engine_manager import EngineManager
+from src.engines.engine_manager import EngineManager
 
 logger = logging.getLogger()
 
@@ -9,9 +9,9 @@ class RenderWorkerFactory:
     @staticmethod
     def supported_classes():
         # to add support for any additional RenderWorker classes, import their classes and add to list here
-        from src.workers.blender_worker import BlenderRenderWorker
+        from src.engines.blender.blender_worker import BlenderRenderWorker
-        from src.workers.aerender_worker import AERenderWorker
+        from src.engines.aerender.aerender_worker import AERenderWorker
-        from src.workers.ffmpeg_worker import FFMPEGRenderWorker
+        from src.engines.ffmpeg.ffmpeg_worker import FFMPEGRenderWorker
         classes = [BlenderRenderWorker, AERenderWorker, FFMPEGRenderWorker]
         return classes
 

src/engines/engine_manager.py

@@ -1,19 +1,13 @@
-import os
 import logging
+import os
 import platform
 import shutil
-from .downloaders.blender_downloader import BlenderDownloader
-from .downloaders.ffmpeg_downloader import FFMPEGDownloader
-from ..utilities.misc_helper import system_safe_path
 
-try:
+from src.engines.blender.blender_downloader import BlenderDownloader
-    from .blender_engine import Blender
+from src.engines.blender.blender_engine import Blender
-except ImportError:
+from src.engines.ffmpeg.ffmpeg_downloader import FFMPEGDownloader
-    from blender_engine import Blender
+from src.engines.ffmpeg.ffmpeg_engine import FFMPEG
-try:
+from src.utilities.misc_helper import system_safe_path
-    from .ffmpeg_engine import FFMPEG
-except ImportError:
-    from ffmpeg_engine import FFMPEG
 
 logger = logging.getLogger()
 

src/engines/ffmpeg/ffmpeg_downloader.py

@@ -5,7 +5,7 @@ import re
 
 import requests
 
-from .downloader_core import download_and_extract_app
+from src.engines.core.downloader_core import download_and_extract_app
 
 logger = logging.getLogger()
 supported_formats = ['.zip', '.tar.xz', '.dmg']

src/engines/ffmpeg/ffmpeg_engine.py

@@ -1,9 +1,7 @@
-try:
-    from .base_engine import *
-except ImportError:
-    from base_engine import *
 import re
 
+from src.engines.core.base_engine import *
+
 
 class FFMPEG(BaseRenderEngine):
 

src/engines/ffmpeg/ffmpeg_worker.py

@@ -2,8 +2,8 @@
 import re
 import subprocess
 
-from src.workers.base_worker import BaseRenderWorker
+from src.engines.core.base_worker import BaseRenderWorker
-from src.engines.ffmpeg_engine import FFMPEG
+from src.engines.ffmpeg.ffmpeg_engine import FFMPEG
 
 
 class FFMPEGRenderWorker(BaseRenderWorker):

src/render_queue.py

@@ -6,7 +6,7 @@ from sqlalchemy.orm import sessionmaker
 
 from src.utilities.status_utils import RenderStatus
 from src.engines.engine_manager import EngineManager
-from src.workers.base_worker import Base
+from src.engines.core.base_worker import Base
 
 logger = logging.getLogger()
 
@@ -84,7 +84,7 @@ class RenderQueue:
 
     @classmethod
     def load_state(cls):
-        from src.workers.base_worker import BaseRenderWorker
+        from src.engines.core.base_worker import BaseRenderWorker
         cls.job_queue = cls.session.query(BaseRenderWorker).all()
 
     @classmethod

src/utilities/ffmpeg_helper.py

@@ -1,5 +1,5 @@
 import subprocess
-from src.engines.ffmpeg_engine import FFMPEG
+from src.engines.ffmpeg.ffmpeg_engine import FFMPEG
 
 
 def image_sequence_to_video(source_glob_pattern, output_path, framerate=24, encoder="prores_ks", profile=4,

start_server.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from src.api_server import start_server
+from src.api.api_server import start_server
 
 if __name__ == '__main__':
     start_server()