move input_configuration.py to configs/input_config.py

sezanzeb · sezanzeb · Dec 15, 2022 · Nov 20, 2022 · Nov 20, 2022 · Nov 21, 2022
commit b41bccefdb3c1fb0ab6cda652059ec57fd776da3
diff --git a/inputremapper/input_configuration.py → inputremapper/configs/input_config.py b/inputremapper/input_configuration.py → inputremapper/configs/input_config.py
@@ -20,7 +20,7 @@
 from __future__ import annotations
 
 import itertools
-from typing import Tuple, Iterable, Union, Callable, Sequence, List, Dict, Optional
+from typing import Tuple, Iterable, Union, List, Dict, Optional
 
 from evdev import ecodes
 from inputremapper.gui.messages.message_types import MessageType
@@ -54,8 +54,6 @@ class InputConfig(BaseModel):
     @property
     def defines_analog_input(self) -> bool:
         """Whether this defines an analog input"""
-        # todo give it a better name once InputEvent and
-        #  InputConfig are seperated
         return not self.analog_threshold and self.type != ecodes.EV_KEY
 
     @property

diff --git a/inputremapper/configs/mapping.py b/inputremapper/configs/mapping.py
@@ -47,7 +47,7 @@
 )
 
 from inputremapper.configs.system_mapping import system_mapping, DISABLE_NAME
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination
 from inputremapper.exceptions import MacroParsingError
 from inputremapper.gui.gettext import _
 from inputremapper.gui.messages.message_types import MessageType

diff --git a/inputremapper/configs/migrations.py b/inputremapper/configs/migrations.py
@@ -51,7 +51,7 @@
 from inputremapper.configs.paths import get_preset_path, mkdir, CONFIG_PATH, remove
 from inputremapper.configs.preset import Preset
 from inputremapper.configs.system_mapping import system_mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.macros.parse import is_this_a_macro
 from inputremapper.logger import logger, VERSION, IS_BETA

diff --git a/inputremapper/configs/preset.py b/inputremapper/configs/preset.py
@@ -23,7 +23,6 @@
 
 import os
 import json
-import traceback
 
 from typing import (
     Tuple,
@@ -38,14 +37,12 @@
 )
 
 from pydantic import ValidationError
-from evdev.ecodes import EV_KEY
 
 from inputremapper.logger import logger
 from inputremapper.configs.mapping import Mapping, UIMapping
 from inputremapper.configs.paths import touch
 
-from inputremapper.input_event import InputEvent
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 
 MappingModel = TypeVar("MappingModel", bound=UIMapping)
 

diff --git a/inputremapper/gui/components/editor.py b/inputremapper/gui/components/editor.py
@@ -46,7 +46,7 @@
 from gi.repository import Gtk, GtkSource, Gdk
 
 from inputremapper.configs.mapping import MappingData
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.groups import DeviceType
 from inputremapper.gui.controller import Controller
 from inputremapper.gui.gettext import _

diff --git a/inputremapper/gui/controller.py b/inputremapper/gui/controller.py
@@ -40,7 +40,7 @@
 
 from inputremapper.configs.mapping import MappingData, UIMapping
 from inputremapper.configs.paths import sanitize_path_component
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.exceptions import DataManagementError
 from inputremapper.gui.data_manager import DataManager, DEFAULT_PRESET_NAME
 from inputremapper.gui.gettext import _
@@ -60,7 +60,6 @@
     InjectorState,
     InjectorStateMessage,
 )
-from inputremapper.input_event import InputEvent
 from inputremapper.logger import logger
 
 if TYPE_CHECKING:

diff --git a/inputremapper/gui/data_manager.py b/inputremapper/gui/data_manager.py
@@ -34,7 +34,7 @@
 from inputremapper.configs.preset import Preset
 from inputremapper.configs.system_mapping import SystemMapping
 from inputremapper.daemon import DaemonProxy
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.exceptions import DataManagementError
 from inputremapper.gui.gettext import _
 from inputremapper.groups import _Group
@@ -53,7 +53,6 @@
     InjectorState,
     InjectorStateMessage,
 )
-from inputremapper.input_event import InputEvent
 from inputremapper.logger import logger
 
 DEFAULT_PRESET_NAME = _("new preset")

diff --git a/inputremapper/gui/messages/message_data.py b/inputremapper/gui/messages/message_data.py
@@ -22,7 +22,7 @@
 from typing import Dict, Tuple, Optional, Callable
 
 from inputremapper.configs.mapping import MappingData
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.gui.messages.message_types import (
     MessageType,
     Name,

diff --git a/inputremapper/gui/reader_client.py b/inputremapper/gui/reader_client.py
@@ -33,7 +33,7 @@
 gi.require_version("GLib", "2.0")
 from gi.repository import GLib
 
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.groups import _Groups, _Group
 from inputremapper.gui.reader_service import (
     MSG_EVENT,

diff --git a/inputremapper/gui/reader_service.py b/inputremapper/gui/reader_service.py
@@ -52,7 +52,7 @@
 from evdev.ecodes import EV_KEY, EV_ABS, EV_REL, REL_HWHEEL, REL_WHEEL
 
 from inputremapper.configs.mapping import UIMapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.groups import _Groups, _Group
 from inputremapper.injection.event_reader import EventReader
 from inputremapper.injection.mapping_handlers.abs_to_btn_handler import AbsToBtnHandler

diff --git a/inputremapper/gui/user_interface.py b/inputremapper/gui/user_interface.py
@@ -30,7 +30,7 @@
 
 from inputremapper.configs.data import get_data_path
 from inputremapper.configs.mapping import MappingData
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.gui.autocompletion import Autocompletion
 from inputremapper.gui.components.editor import (
     MappingListBox,

diff --git a/inputremapper/injection/injector.py b/inputremapper/injection/injector.py
@@ -32,7 +32,7 @@
 import evdev
 
 from inputremapper.configs.preset import Preset
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.groups import (
     _Group,
     classify,

diff --git a/inputremapper/injection/mapping_handlers/abs_to_abs_handler.py b/inputremapper/injection/mapping_handlers/abs_to_abs_handler.py
@@ -24,7 +24,7 @@
 
 from inputremapper import exceptions
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.mapping_handlers.axis_transform import Transformation
 from inputremapper.injection.mapping_handlers.mapping_handler import (

diff --git a/inputremapper/injection/mapping_handlers/abs_to_btn_handler.py b/inputremapper/injection/mapping_handlers/abs_to_btn_handler.py
@@ -24,7 +24,7 @@
 from evdev.ecodes import EV_ABS
 
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.mapping_handlers.mapping_handler import (
     MappingHandler,
     InputEventHandler,

diff --git a/inputremapper/injection/mapping_handlers/abs_to_rel_handler.py b/inputremapper/injection/mapping_handlers/abs_to_rel_handler.py
@@ -40,7 +40,7 @@
     WHEEL_HI_RES_SCALING,
     DEFAULT_REL_RATE,
 )
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.mapping_handlers.axis_transform import Transformation
 from inputremapper.injection.mapping_handlers.mapping_handler import (

diff --git a/inputremapper/injection/mapping_handlers/axis_switch_handler.py b/inputremapper/injection/mapping_handlers/axis_switch_handler.py
@@ -19,10 +19,9 @@
 from typing import Dict, Tuple
 
 import evdev
-from evdev.ecodes import EV_KEY
 
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.mapping_handlers.mapping_handler import (
     MappingHandler,
     HandlerEnums,

diff --git a/inputremapper/injection/mapping_handlers/combination_handler.py b/inputremapper/injection/mapping_handlers/combination_handler.py
@@ -23,7 +23,7 @@
 from evdev.ecodes import EV_ABS, EV_REL
 
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.mapping_handlers.mapping_handler import (
     MappingHandler,
     InputEventHandler,

diff --git a/inputremapper/injection/mapping_handlers/hierarchy_handler.py b/inputremapper/injection/mapping_handlers/hierarchy_handler.py
@@ -21,7 +21,7 @@
 import evdev
 from evdev.ecodes import EV_ABS, EV_REL
 
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.mapping_handlers.mapping_handler import (
     MappingHandler,
     InputEventHandler,

diff --git a/inputremapper/injection/mapping_handlers/key_handler.py b/inputremapper/injection/mapping_handlers/key_handler.py
@@ -21,7 +21,7 @@
 
 from inputremapper import exceptions
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.exceptions import MappingParsingError
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.mapping_handlers.mapping_handler import (

diff --git a/inputremapper/injection/mapping_handlers/macro_handler.py b/inputremapper/injection/mapping_handlers/macro_handler.py
@@ -21,7 +21,7 @@
 from typing import Dict, Callable
 
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.macros.macro import Macro
 from inputremapper.injection.macros.parse import parse

diff --git a/inputremapper/injection/mapping_handlers/mapping_handler.py b/inputremapper/injection/mapping_handlers/mapping_handler.py
@@ -66,9 +66,9 @@
 import evdev
 
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.exceptions import MappingParsingError
-from inputremapper.input_event import InputEvent, EventActions
+from inputremapper.input_event import InputEvent
 from inputremapper.logger import logger
 
 

diff --git a/inputremapper/injection/mapping_handlers/mapping_parser.py b/inputremapper/injection/mapping_handlers/mapping_parser.py
@@ -27,7 +27,7 @@
 from inputremapper.configs.mapping import Mapping
 from inputremapper.configs.preset import Preset
 from inputremapper.configs.system_mapping import DISABLE_CODE, DISABLE_NAME
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.exceptions import MappingParsingError
 from inputremapper.injection.macros.parse import is_this_a_macro
 from inputremapper.injection.mapping_handlers.abs_to_abs_handler import AbsToAbsHandler

diff --git a/inputremapper/injection/mapping_handlers/null_handler.py b/inputremapper/injection/mapping_handlers/null_handler.py
@@ -21,7 +21,7 @@
 
 import evdev
 
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.mapping_handlers.mapping_handler import (
     MappingHandler,
     HandlerEnums,

diff --git a/inputremapper/injection/mapping_handlers/rel_to_abs_handler.py b/inputremapper/injection/mapping_handlers/rel_to_abs_handler.py
@@ -38,7 +38,7 @@
     REL_XY_SCALING,
     DEFAULT_REL_RATE,
 )
-from inputremapper.input_configuration import InputCombination
+from configs.input_config import InputCombination
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.mapping_handlers.axis_transform import Transformation
 from inputremapper.injection.mapping_handlers.mapping_handler import (

diff --git a/inputremapper/injection/mapping_handlers/rel_to_btn_handler.py b/inputremapper/injection/mapping_handlers/rel_to_btn_handler.py
@@ -24,7 +24,7 @@
 from evdev.ecodes import EV_REL
 
 from inputremapper.configs.mapping import Mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.mapping_handlers.mapping_handler import (
     MappingHandler,
     InputEventHandler,

diff --git a/inputremapper/injection/mapping_handlers/rel_to_rel_handler.py b/inputremapper/injection/mapping_handlers/rel_to_rel_handler.py
@@ -36,7 +36,7 @@
     WHEEL_SCALING,
     WHEEL_HI_RES_SCALING,
 )
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.mapping_handlers.axis_transform import Transformation
 from inputremapper.injection.mapping_handlers.mapping_handler import (

diff --git a/tests/integration/test_components.py b/tests/integration/test_components.py
@@ -85,7 +85,7 @@
     DeviceGroupSelection,
 )
 from inputremapper.configs.mapping import MappingData
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 
 
 class ComponentBaseTest(unittest.TestCase):

diff --git a/tests/integration/test_gui.py b/tests/integration/test_gui.py
@@ -81,7 +81,7 @@
 from inputremapper.gui.utils import gtk_iteration, Colors, debounce, debounce_manager
 from inputremapper.gui.user_interface import UserInterface
 from inputremapper.injection.injector import InjectorState
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.daemon import Daemon, DaemonProxy
 
 

diff --git a/tests/integration/test_user_interface.py b/tests/integration/test_user_interface.py
@@ -15,7 +15,7 @@
 from inputremapper.gui.messages.message_broker import MessageBroker, MessageType
 from inputremapper.gui.user_interface import UserInterface
 from inputremapper.configs.mapping import MappingData
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 
 
 class TestUserInterface(unittest.TestCase):

diff --git a/tests/unit/test_controller.py b/tests/unit/test_controller.py
@@ -26,12 +26,11 @@
 
 from inputremapper.configs.system_mapping import system_mapping
 from inputremapper.injection.injector import InjectorState
-from inputremapper.input_event import InputEvent
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.groups import _Groups
 from inputremapper.gui.messages.message_broker import (
     MessageBroker,

diff --git a/tests/unit/test_daemon.py b/tests/unit/test_daemon.py
@@ -41,7 +41,7 @@
 from inputremapper.configs.global_config import global_config
 from inputremapper.groups import groups
 from inputremapper.configs.paths import get_config_path, mkdir, get_preset_path
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.configs.preset import Preset
 from inputremapper.injection.injector import InjectorState
 from inputremapper.daemon import Daemon

diff --git a/tests/unit/test_data_manager.py b/tests/unit/test_data_manager.py
@@ -27,7 +27,7 @@
 from inputremapper.configs.global_config import global_config
 from inputremapper.configs.mapping import UIMapping, MappingData
 from inputremapper.configs.system_mapping import system_mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.exceptions import DataManagementError
 from inputremapper.groups import _Groups
 from inputremapper.gui.messages.message_broker import (
@@ -40,7 +40,6 @@
 )
 from inputremapper.gui.reader_client import ReaderClient
 from inputremapper.injection.global_uinputs import GlobalUInputs
-from inputremapper.input_event import InputEvent
 from tests.lib.cleanup import quick_cleanup
 from tests.lib.patches import FakeDaemonProxy
 from tests.lib.fixtures import prepare_presets, get_combination_config

diff --git a/tests/unit/test_event_pipeline/test_event_pipeline.py b/tests/unit/test_event_pipeline/test_event_pipeline.py
@@ -54,7 +54,7 @@
 )
 from inputremapper.configs.preset import Preset
 from inputremapper.configs.system_mapping import system_mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.context import Context
 from inputremapper.injection.event_reader import EventReader
 from inputremapper.injection.global_uinputs import global_uinputs

diff --git a/tests/unit/test_event_pipeline/test_mapping_handlers.py b/tests/unit/test_event_pipeline/test_mapping_handlers.py
@@ -46,7 +46,7 @@
 from inputremapper.injection.mapping_handlers.rel_to_btn_handler import RelToBtnHandler
 
 from inputremapper.configs.mapping import Mapping, DEFAULT_REL_RATE
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.global_uinputs import global_uinputs
 from inputremapper.injection.mapping_handlers.abs_to_abs_handler import AbsToAbsHandler
 from inputremapper.injection.mapping_handlers.abs_to_btn_handler import AbsToBtnHandler

diff --git a/tests/unit/test_event_reader.py b/tests/unit/test_event_reader.py
@@ -39,7 +39,7 @@
 from inputremapper.configs.mapping import Mapping
 from inputremapper.configs.preset import Preset
 from inputremapper.configs.system_mapping import system_mapping
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.context import Context
 from inputremapper.injection.event_reader import EventReader
 from inputremapper.injection.global_uinputs import global_uinputs

diff --git a/tests/unit/test_injector.py b/tests/unit/test_injector.py
@@ -61,7 +61,7 @@
     DISABLE_NAME,
 )
 from inputremapper.configs.preset import Preset
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from inputremapper.injection.macros.parse import parse
 from inputremapper.injection.context import Context
 from inputremapper.groups import groups, classify, DeviceType

diff --git a/tests/unit/test_input_combination.py b/tests/unit/test_input_combination.py
@@ -43,7 +43,7 @@
     KEY_LEFTCTRL,
 )
 
-from inputremapper.input_configuration import InputCombination, InputConfig
+from configs.input_config import InputCombination, InputConfig
 from tests.lib.fixtures import get_combination_config