Improved test setup

bin/input-remapper-gtk

@@ -22,14 +22,15 @@
 
 from __future__ import annotations
 
-import sys
 import atexit
+import sys
 from argparse import ArgumentParser
 
 import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('GLib', '2.0')
-gi.require_version('GtkSource', '4')
+
+gi.require_version("Gtk", "3.0")
+gi.require_version("GLib", "2.0")
+gi.require_version("GtkSource", "4")
 from gi.repository import Gtk
 
 # https://github.com/Nuitka/Nuitka/issues/607#issuecomment-650217096
@@ -38,7 +39,7 @@ Gtk.init()
 from inputremapper.gui.gettext import _, LOCALE_DIR
 from inputremapper.gui.reader_service import ReaderService
 from inputremapper.daemon import DaemonProxy
-from inputremapper.logger import logger, update_verbosity, log_info
+from inputremapper.logger.logger import logger
 
 
 def start_processes() -> DaemonProxy:
@@ -53,18 +54,21 @@ def start_processes() -> DaemonProxy:
     return Daemon.connect()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     parser = ArgumentParser()
     parser.add_argument(
-        '-d', '--debug', action='store_true', dest='debug',
-        help=_('Displays additional debug information'),
-        default=False
+        "-d",
+        "--debug",
+        action="store_true",
+        dest="debug",
+        help=_("Displays additional debug information"),
+        default=False,
     )
 
     options = parser.parse_args(sys.argv[1:])
-    update_verbosity(options.debug)
-    log_info('input-remapper-gtk')
-    logger.debug('Using locale directory: {}'.format(LOCALE_DIR))
+    logger.update_verbosity(options.debug)
+    logger.log_info("input-remapper-gtk")
+    logger.debug("Using locale directory: {}".format(LOCALE_DIR))
 
     # import input-remapper stuff after setting the log verbosity
     from inputremapper.gui.messages.message_broker import MessageBroker, MessageType
@@ -89,7 +93,12 @@ if __name__ == '__main__':
     daemon = start_processes()
 
     data_manager = DataManager(
-        message_broker, GlobalConfig(), reader_client, daemon, GlobalUInputs(), system_mapping
+        message_broker,
+        GlobalConfig(),
+        reader_client,
+        daemon,
+        GlobalUInputs(),
+        system_mapping,
     )
     controller = Controller(message_broker, data_manager)
     user_interface = UserInterface(message_broker, controller)

bin/input-remapper-reader-service

@@ -21,21 +21,24 @@
 
 """Starts the root reader-service."""
 import asyncio
-import os
-import sys
 import atexit
+import os
 import signal
+import sys
 from argparse import ArgumentParser
 
-from inputremapper.logger import update_verbosity
 from inputremapper.groups import _Groups
+from inputremapper.logger.logger import update_verbosity
 
-
-if __name__ == '__main__':
+if __name__ == "__main__":
     parser = ArgumentParser()
     parser.add_argument(
-        '-d', '--debug', action='store_true', dest='debug',
-        help='Displays additional debug information', default=False
+        "-d",
+        "--debug",
+        action="store_true",
+        dest="debug",
+        help="Displays additional debug information",
+        default=False,
     )
 
     options = parser.parse_args(sys.argv[1:])

bin/input-remapper-service

@@ -25,18 +25,24 @@
 import sys
 from argparse import ArgumentParser
 
-from inputremapper.logger import update_verbosity, log_info
+from inputremapper.logger.logger import update_verbosity, log_info
 
-
-if __name__ == '__main__':
+if __name__ == "__main__":
     parser = ArgumentParser()
     parser.add_argument(
-        '-d', '--debug', action='store_true', dest='debug',
-        help='Displays additional debug information', default=False
+        "-d",
+        "--debug",
+        action="store_true",
+        dest="debug",
+        help="Displays additional debug information",
+        default=False,
     )
     parser.add_argument(
-        '--hide-info', action='store_true', dest='hide_info',
-        help='Don\'t display version information', default=False
+        "--hide-info",
+        action="store_true",
+        dest="hide_info",
+        help="Don't display version information",
+        default=False,
     )
 
     options = parser.parse_args(sys.argv[1:])
@@ -47,7 +53,7 @@ if __name__ == '__main__':
     from inputremapper.daemon import Daemon
 
     if not options.hide_info:
-        log_info('input-remapper-service')
+        log_info("input-remapper-service")
 
     daemon = Daemon()
     daemon.publish()

inputremapper/configs/base_config.py

@@ -22,7 +22,7 @@
 import copy
 from typing import Union, List, Optional, Callable, Any
 
-from inputremapper.logger import logger, VERSION
+from inputremapper.logger.logger import logger, VERSION
 
 NONE = "none"
 

inputremapper/configs/data.py

@@ -27,7 +27,7 @@
 
 import pkg_resources
 
-from inputremapper.logger import logger
+from inputremapper.logger.logger import logger
 
 logged = False
 

inputremapper/configs/global_config.py

@@ -24,8 +24,9 @@
 from typing import Optional
 
 from inputremapper.configs.base_config import ConfigBase, INITIAL_CONFIG
-from inputremapper.configs.paths import CONFIG_PATH, USER, touch
-from inputremapper.logger import logger
+from inputremapper.configs.paths import PathUtils
+from inputremapper.user import UserUtils
+from inputremapper.logger.logger import logger
 
 MOUSE = "mouse"
 WHEEL = "wheel"
@@ -42,7 +43,7 @@ class GlobalConfig(ConfigBase):
     """
 
     def __init__(self):
-        self.path = os.path.join(CONFIG_PATH, "config.json")
+        self.path = os.path.join(PathUtils.config_path(), "config.json")
         super().__init__()
 
     def get_dir(self) -> str:
@@ -118,11 +119,11 @@ def load_config(self, path: Optional[str] = None):
 
     def _save_config(self):
         """Save the config to the file system."""
-        if USER == "root":
+        if UserUtils.user == "root":
             logger.debug("Skipping config file creation for the root user")
             return
 
-        touch(self.path)
+        PathUtils.touch(self.path)
 
         with open(self.path, "w") as file:
             json.dump(self._config, file, indent=4)

inputremapper/configs/input_config.py

@@ -33,7 +33,7 @@
 
 from inputremapper.configs.system_mapping import system_mapping
 from inputremapper.gui.messages.message_types import MessageType
-from inputremapper.logger import logger
+from inputremapper.logger.logger import logger
 from inputremapper.utils import get_evdev_constant_name
 
 # having shift in combinations modifies the configured output,

inputremapper/configs/mapping.py

@@ -73,11 +73,10 @@
     SymbolAndCodeMismatchError,
     MissingMacroOrKeyError,
     MissingOutputAxisError,
-    MacroParsingError,
 )
 from inputremapper.gui.gettext import _
 from inputremapper.gui.messages.message_types import MessageType
-from inputremapper.injection.global_uinputs import can_default_uinput_emit
+from inputremapper.injection.global_uinputs import GlobalUInputs
 from inputremapper.injection.macros.parse import is_this_a_macro, parse
 from inputremapper.utils import get_evdev_constant_name
 
@@ -393,7 +392,9 @@ def validate_symbol(cls, values):
             raise OutputSymbolUnknownError(symbol)
 
         target = values.get("target_uinput")
-        if target is not None and not can_default_uinput_emit(target, EV_KEY, code):
+        if target is not None and not GlobalUInputs.can_default_uinput_emit(
+            target, EV_KEY, code
+        ):
             raise SymbolNotAvailableInTargetError(symbol, target)
 
         return values