removed inputconfigs shorthands

inputremapper/configs/input_config.py

@@ -75,35 +75,6 @@ def __repr__(self):
             f"at {hex(id(self))}>"
         )
 
-    @classmethod
-    def abs(cls, code, analog_threshold, origin_hash: Optional[DeviceHash] = None):
-        """Create a new InputConfig object for an abs input like joysticks."""
-        # TODO analog_threshold default None and move to last param?
-        return InputConfig(
-            type=EV_ABS,
-            code=code,
-            analog_threshold=analog_threshold,
-            origin_hash=origin_hash,
-        )
-
-    @classmethod
-    def key(cls, code, origin_hash: Optional[DeviceHash] = None):
-        """Create a new InputConfig object for a key/btn input."""
-        return InputConfig(
-            type=EV_KEY,
-            code=code,
-            origin_hash=origin_hash,
-        )
-
-    @classmethod
-    def rel(cls, code, origin_hash: Optional[DeviceHash] = None):
-        """Create a new InputConfig object for a rel input like mouse movements."""
-        return InputConfig(
-            type=EV_REL,
-            code=code,
-            origin_hash=origin_hash,
-        )
-
     @property
     def input_match_hash(self) -> Hashable:
         """a Hashable object which is intended to match the InputConfig with a

inputremapper/injection/mapping_handlers/abs_to_btn_handler.py

@@ -18,7 +18,7 @@
 # along with input-remapper.  If not, see <https://www.gnu.org/licenses/>.
 
 
-from typing import Tuple, Optional
+from typing import Tuple
 
 import evdev
 from evdev.ecodes import EV_ABS

tests/unit/test_daemon.py

@@ -17,6 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with input-remapper.  If not, see <https://www.gnu.org/licenses/>.
+from evdev._ecodes import EV_ABS
 
 from inputremapper.input_event import InputEvent
 from tests.test import is_service_running
@@ -124,14 +125,18 @@ def test_daemon(self):
         preset = Preset(group.get_preset_path(preset_name))
         preset.add(
             Mapping.from_combination(
-                input_combination=InputCombination([InputConfig.key(BTN_A)]),
+                input_combination=InputCombination(
+                    [InputConfig(type=EV_KEY, code=BTN_A)]
+                ),
                 target_uinput="keyboard",
                 output_symbol="a",
             )
         )
         preset.add(
             Mapping.from_combination(
-                input_combination=InputCombination([InputConfig.abs(ABS_X, -1)]),
+                input_combination=InputCombination(
+                    [InputConfig(type=EV_ABS, code=ABS_X, analog_threshold=-1)]
+                ),
                 target_uinput="keyboard",
                 output_symbol="b",
             )
@@ -236,7 +241,9 @@ def test_refresh_on_start(self):
         preset = Preset(get_preset_path(group_name, preset_name))
         preset.add(
             Mapping.from_combination(
-                InputCombination([InputConfig.key(key_code)]), "keyboard", "a"
+                InputCombination([InputConfig(type=EV_KEY, code=key_code)]),
+                "keyboard",
+                "a",
             )
         )
 
@@ -323,7 +330,7 @@ def test_xmodmap_file(self):
         preset = Preset(path)
         preset.add(
             Mapping.from_combination(
-                InputCombination([InputConfig.key(from_keycode)]),
+                InputCombination([InputConfig(type=EV_KEY, code=from_keycode)]),
                 target,
                 to_name,
             )

tests/unit/test_event_pipeline/test_event_pipeline.py

@@ -372,15 +372,29 @@ async def test_combination(self):
         origin_hash = origin.get_device_hash()
 
         mapping_1 = Mapping.from_combination(
-            InputCombination([InputConfig.abs(ABS_X, 1, origin_hash)]),
+            InputCombination(
+                [
+                    InputConfig(
+                        type=EV_ABS,
+                        code=ABS_X,
+                        analog_threshold=1,
+                        origin_hash=origin_hash,
+                    )
+                ]
+            ),
             output_symbol="a",
         )
 
         mapping_2 = Mapping.from_combination(
             InputCombination(
                 [
-                    InputConfig.abs(ABS_X, 1, origin_hash),
-                    InputConfig.key(BTN_A, origin_hash),
+                    InputConfig(
+                        type=EV_ABS,
+                        code=ABS_X,
+                        analog_threshold=1,
+                        origin_hash=origin_hash,
+                    ),
+                    InputConfig(type=EV_KEY, code=BTN_A, origin_hash=origin_hash),
                 ]
             ),
             output_symbol="b",
@@ -389,9 +403,14 @@ async def test_combination(self):
         mapping_3 = Mapping.from_combination(
             InputCombination(
                 [
-                    InputConfig.abs(ABS_X, 1, origin_hash),
-                    InputConfig.key(BTN_A, origin_hash),
-                    InputConfig.key(BTN_B, origin_hash),
+                    InputConfig(
+                        type=EV_ABS,
+                        code=ABS_X,
+                        analog_threshold=1,
+                        origin_hash=origin_hash,
+                    ),
+                    InputConfig(type=EV_KEY, code=BTN_A, origin_hash=origin_hash),
+                    InputConfig(type=EV_KEY, code=BTN_B, origin_hash=origin_hash),
                 ]
             ),
             output_symbol="c",
@@ -458,7 +477,9 @@ async def test_ignore_hold(self):
         preset = Preset()
         preset.add(
             Mapping.from_combination(
-                input_combination=InputCombination([InputConfig.key(KEY_A)]),
+                input_combination=InputCombination(
+                    [InputConfig(type=EV_KEY, code=KEY_A)]
+                ),
                 output_symbol="a",
             )
         )

tests/unit/test_injector.py

@@ -173,8 +173,9 @@ def test_grab_device_1(self):
             Mapping.from_combination(
                 InputCombination(
                     [
-                        InputConfig.abs(
-                            ABS_HAT0X,
+                        InputConfig(
+                            type=EV_ABS,
+                            code=ABS_HAT0X,
                             analog_threshold=1,
                             origin_hash=device_hash,
                         )
@@ -204,7 +205,7 @@ def test_forward_gamepad_events(self):
         preset.add(
             Mapping.from_combination(
                 input_combination=InputCombination(
-                    [InputConfig.key(BTN_A, origin_hash=device_hash)]
+                    [InputConfig(type=EV_KEY, code=BTN_A, origin_hash=device_hash)]
                 ),
                 target_uinput="keyboard",
                 output_symbol="a",