Reorg plugins and template

Rexeh · May 22, 2024 · 12a8b5f · 12a8b5f
1 parent bf95064
commit 12a8b5f
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/joystick_diagrams/app_state.py b/joystick_diagrams/app_state.py
@@ -1,10 +1,10 @@
 import logging
 
-from joystick_diagrams.plugin_wrapper import PluginWrapper
 from joystick_diagrams.plugins.plugin_manager import ParserPluginManager
+from joystick_diagrams.plugins.plugin_wrapper import PluginWrapper
 from joystick_diagrams.profile.profile import Profile_
 from joystick_diagrams.profile.profile_collection import ProfileCollection
-from joystick_diagrams.profile_wrapper import ProfileWrapper
+from joystick_diagrams.profile.profile_wrapper import ProfileWrapper
 
 _logger = logging.getLogger(__name__)
 

diff --git a/joystick_diagrams/export/export.py b/joystick_diagrams/export/export.py
@@ -14,7 +14,7 @@
 from joystick_diagrams import utils
 from joystick_diagrams.export.export_device import ExportDevice
 from joystick_diagrams.input.modifier import Modifier
-from joystick_diagrams.template import Template
+from joystick_diagrams.template.template import Template
 
 _logger = logging.getLogger(__name__)
 

diff --git a/joystick_diagrams/export/export_device.py b/joystick_diagrams/export/export_device.py
@@ -2,8 +2,8 @@
 
 from joystick_diagrams.input import device
 from joystick_diagrams.input.device import Device_
-from joystick_diagrams.profile_wrapper import ProfileWrapper
-from joystick_diagrams.template import Template
+from joystick_diagrams.profile.profile_wrapper import ProfileWrapper
+from joystick_diagrams.template.template import Template
 
 
 @dataclass

diff --git a/joystick_diagrams/plugins/plugin_manager.py b/joystick_diagrams/plugins/plugin_manager.py
@@ -18,8 +18,8 @@
 from dynaconf import ValidationError  # type: ignore
 
 from joystick_diagrams.exceptions import JoystickDiagramsError, PluginNotValidError
-from joystick_diagrams.plugin_wrapper import PluginWrapper
 from joystick_diagrams.plugins.plugin_interface import PluginInterface
+from joystick_diagrams.plugins.plugin_wrapper import PluginWrapper
 
 _logger = logging.getLogger(__name__)
 

diff --git a/joystick_diagrams/plugin_wrapper.py → joystick_diagrams/plugins/plugin_wrapper.py b/joystick_diagrams/plugin_wrapper.py → joystick_diagrams/plugins/plugin_wrapper.py
diff --git a/joystick_diagrams/profile_wrapper.py → joystick_diagrams/profile/profile_wrapper.py b/joystick_diagrams/profile_wrapper.py → joystick_diagrams/profile/profile_wrapper.py
@@ -5,7 +5,7 @@
 from copy import deepcopy
 
 from joystick_diagrams.db import db_profile_parents, db_profiles
-from joystick_diagrams.plugin_wrapper import PluginWrapper
+from joystick_diagrams.plugins.plugin_wrapper import PluginWrapper
 from joystick_diagrams.profile.profile import Profile_
 
 _logger = logging.getLogger(__name__)

diff --git a/joystick_diagrams/template.py → joystick_diagrams/template/template.py b/joystick_diagrams/template.py → joystick_diagrams/template/template.py
diff --git a/joystick_diagrams/ui/configure_page.py b/joystick_diagrams/ui/configure_page.py
@@ -16,7 +16,7 @@
 from joystick_diagrams.input.types.axis import Axis, AxisSlider
 from joystick_diagrams.input.types.button import Button
 from joystick_diagrams.input.types.hat import Hat
-from joystick_diagrams.profile_wrapper import ProfileWrapper
+from joystick_diagrams.profile.profile_wrapper import ProfileWrapper
 from joystick_diagrams.ui import parent_profiles
 from joystick_diagrams.ui.qt_designer import configure_page_ui
 

diff --git a/joystick_diagrams/ui/device_setup_controller.py b/joystick_diagrams/ui/device_setup_controller.py
@@ -9,8 +9,8 @@
 )
 from joystick_diagrams.exceptions import JoystickDiagramsError
 from joystick_diagrams.export.export_device import ExportDevice
-from joystick_diagrams.profile_wrapper import ProfileWrapper
-from joystick_diagrams.template import Template
+from joystick_diagrams.profile.profile_wrapper import ProfileWrapper
+from joystick_diagrams.template.template import Template
 
 _logger = logging.getLogger(__name__)
 

diff --git a/joystick_diagrams/ui/parent_profiles.py b/joystick_diagrams/ui/parent_profiles.py
@@ -6,7 +6,7 @@
 from PySide6.QtWidgets import QListWidgetItem, QMainWindow
 
 from joystick_diagrams.app_state import AppState
-from joystick_diagrams.profile_wrapper import ProfileWrapper
+from joystick_diagrams.profile.profile_wrapper import ProfileWrapper
 from joystick_diagrams.ui.qt_designer import parent_profile_management_ui
 
 _logger = logging.getLogger(__name__)

diff --git a/joystick_diagrams/ui/plugins_page.py b/joystick_diagrams/ui/plugins_page.py
@@ -17,8 +17,8 @@
 
 from joystick_diagrams.app_state import AppState
 from joystick_diagrams.exceptions import JoystickDiagramsError
-from joystick_diagrams.plugin_wrapper import PluginWrapper
 from joystick_diagrams.plugins.plugin_interface import PluginInterface
+from joystick_diagrams.plugins.plugin_wrapper import PluginWrapper
 from joystick_diagrams.ui.qt_designer import setting_page_ui
 
 _logger = logging.getLogger(__name__)

diff --git a/tests/test_export_device.py b/tests/test_export_device.py
@@ -7,7 +7,7 @@
 from joystick_diagrams.input.types.axis import Axis, AxisDirection
 from joystick_diagrams.input.types.button import Button
 from joystick_diagrams.input.types.hat import Hat, HatDirection
-from joystick_diagrams.template import Template
+from joystick_diagrams.template.template import Template
 
 DATA_DIR = "tests/data/"
 TEST_FILE = "template_test.svg"

diff --git a/tests/test_template.py b/tests/test_template.py
@@ -3,7 +3,7 @@
 import pytest
 
 from joystick_diagrams.exceptions import JoystickDiagramsError
-from joystick_diagrams.template import Template
+from joystick_diagrams.template.template import Template
 
 
 @pytest.fixture