Remove the underscores

s0md3v · Aug 16, 2023 · 7009b2e · 7009b2e
1 parent 7104204
commit 7009b2e
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 5 deletions.
diff --git a/roop/core.py b/roop/core.py
@@ -92,7 +92,7 @@ def suggest_execution_providers_choices() -> List[str]:
 
 
 def suggest_ui_layouts_choices() -> List[str]:
-    return list_module_names('roop/uis/__layouts__')
+    return list_module_names('roop/uis/layouts')
 
 
 def suggest_execution_thread_count_default() -> int:

diff --git a/roop/processors/frame/core.py b/roop/processors/frame/core.py
@@ -27,7 +27,7 @@
 
 def load_frame_processor_module(frame_processor: str) -> Any:
     try:
-        frame_processor_module = importlib.import_module(f'roop.processors.frame.__modules__.{frame_processor}')
+        frame_processor_module = importlib.import_module(f'roop.processors.frame.modules.{frame_processor}')
         for method_name in FRAME_PROCESSORS_METHODS:
             if not hasattr(frame_processor_module, method_name):
                 raise NotImplementedError
@@ -57,7 +57,7 @@ def clear_frame_processors_modules() -> None:
 
 
 def list_frame_processors_names() -> Optional[List[str]]:
-    return list_module_names('roop/processors/frame/__modules__')
+    return list_module_names('roop/processors/frame/modules')
 
 
 def multi_process_frame(source_path: str, temp_frame_paths: List[str], process_frames: Callable[[str, List[str], Any], None], update: Callable[[], None]) -> None:

diff --git a/.../processors/frame/__modules__/__init__.py → roop/processors/frame/modules/__init__.py b/.../processors/frame/__modules__/__init__.py → roop/processors/frame/modules/__init__.py
diff --git a/...essors/frame/__modules__/face_enhancer.py → ...processors/frame/modules/face_enhancer.py b/...essors/frame/__modules__/face_enhancer.py → ...processors/frame/modules/face_enhancer.py
diff --git a/...cessors/frame/__modules__/face_swapper.py → .../processors/frame/modules/face_swapper.py b/...cessors/frame/__modules__/face_swapper.py → .../processors/frame/modules/face_swapper.py
diff --git a/...ssors/frame/__modules__/frame_enhancer.py → ...rocessors/frame/modules/frame_enhancer.py b/...ssors/frame/__modules__/frame_enhancer.py → ...rocessors/frame/modules/frame_enhancer.py
diff --git a/roop/uis/__components__/__init__.py → roop/uis/components/__init__.py b/roop/uis/__components__/__init__.py → roop/uis/components/__init__.py
diff --git a/roop/uis/__components__/execution.py → roop/uis/components/execution.py b/roop/uis/__components__/execution.py → roop/uis/components/execution.py
diff --git a/roop/uis/__components__/face_analyser.py → roop/uis/components/face_analyser.py b/roop/uis/__components__/face_analyser.py → roop/uis/components/face_analyser.py
diff --git a/roop/uis/__components__/face_selector.py → roop/uis/components/face_selector.py b/roop/uis/__components__/face_selector.py → roop/uis/components/face_selector.py
diff --git a/roop/uis/__components__/output.py → roop/uis/components/output.py b/roop/uis/__components__/output.py → roop/uis/components/output.py
diff --git a/roop/uis/__components__/output_settings.py → roop/uis/components/output_settings.py b/roop/uis/__components__/output_settings.py → roop/uis/components/output_settings.py
diff --git a/roop/uis/__components__/preview.py → roop/uis/components/preview.py b/roop/uis/__components__/preview.py → roop/uis/components/preview.py
diff --git a/roop/uis/__components__/processor.py → roop/uis/components/processor.py b/roop/uis/__components__/processor.py → roop/uis/components/processor.py
diff --git a/roop/uis/__components__/settings.py → roop/uis/components/settings.py b/roop/uis/__components__/settings.py → roop/uis/components/settings.py
diff --git a/roop/uis/__components__/source.py → roop/uis/components/source.py b/roop/uis/__components__/source.py → roop/uis/components/source.py
diff --git a/roop/uis/__components__/target.py → roop/uis/components/target.py b/roop/uis/__components__/target.py → roop/uis/components/target.py
diff --git a/roop/uis/__components__/temp_frame.py → roop/uis/components/temp_frame.py b/roop/uis/__components__/temp_frame.py → roop/uis/components/temp_frame.py
diff --git a/roop/uis/__components__/trim_frame.py → roop/uis/components/trim_frame.py b/roop/uis/__components__/trim_frame.py → roop/uis/components/trim_frame.py
diff --git a/roop/uis/core.py b/roop/uis/core.py
@@ -29,7 +29,7 @@ def init() -> None:
 
 def load_ui_layout_module(ui_layout: str) -> Any:
     try:
-        ui_layout_module = importlib.import_module(f'roop.uis.__layouts__.{ui_layout}')
+        ui_layout_module = importlib.import_module(f'roop.uis.layouts.{ui_layout}')
         for method_name in UI_LAYOUT_METHODS:
             if not hasattr(ui_layout_module, method_name):
                 raise NotImplementedError

diff --git a/roop/uis/__layouts__/default.py → roop/uis/layouts/default.py b/roop/uis/__layouts__/default.py → roop/uis/layouts/default.py
@@ -1,6 +1,6 @@
 import gradio
 
-from roop.uis.__components__ import processor, execution, temp_frame, settings, source, target, preview, trim_frame, face_analyser, face_selector, output_settings, output
+from roop.uis.components import processor, execution, temp_frame, settings, source, target, preview, trim_frame, face_analyser, face_selector, output_settings, output
 
 
 def render() -> gradio.Blocks: