refactoring

4 files changed, 20 insertions, 37 deletions

diff --git a/kvmd/apps/otg/__init__.py b/kvmd/apps/otg/__init__.py
index fba00b73..c073ed91 100644
--- a/kvmd/apps/otg/__init__.py
+++ b/kvmd/apps/otg/__init__.py
@@ -38,7 +38,6 @@ from ...yamlconf import Section
 
 from ...validators import ValidatorError
 
-from ... import env
 from ... import usb
 
 from .. import init
@@ -147,7 +146,7 @@ class _GadgetConfig:
                 # a Microsoft-specific extension of USB.
                 _write(join(func_path, "os_desc/interface.rndis/compatible_id"), "RNDIS")
                 _write(join(func_path, "os_desc/interface.rndis/sub_compatible_id"), "5162001")
-            _symlink(self.__profile_path, join(self.__gadget_path, "os_desc/c.1"))
+            _symlink(self.__profile_path, join(self.__gadget_path, "os_desc", usb.G_PROFILE_NAME))
         _symlink(func_path, join(self.__profile_path, func))
         self.__create_meta(func, "Ethernet")
 
@@ -207,7 +206,7 @@ def _cmd_start(config: Section) -> None:  # pylint: disable=too-many-statements
     logger.info("Using UDC %s", udc)
 
     logger.info("Creating gadget %r ...", config.otg.gadget)
-    gadget_path = join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", config.otg.gadget)
+    gadget_path = usb.get_gadget_path(config.otg.gadget)
     _mkdir(gadget_path)
 
     _write(join(gadget_path, "idVendor"), f"0x{config.otg.vendor_id:04X}")
@@ -229,7 +228,7 @@ def _cmd_start(config: Section) -> None:  # pylint: disable=too-many-statements
     _write(join(lang_path, "product"), config.otg.product)
     _write(join(lang_path, "serialnumber"), config.otg.serial)
 
-    profile_path = join(gadget_path, "configs/c.1")
+    profile_path = join(gadget_path, usb.G_PROFILE)
     _mkdir(profile_path)
     _mkdir(join(profile_path, "strings/0x409"))
     _write(join(profile_path, "strings/0x409/configuration"), f"Config 1: {config.otg.config}")
@@ -285,14 +284,14 @@ def _cmd_stop(config: Section) -> None:
 
     _check_config(config)
 
-    gadget_path = join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", config.otg.gadget)
+    gadget_path = usb.get_gadget_path(config.otg.gadget)
 
     logger.info("Disabling gadget %r ...", config.otg.gadget)
     _write(join(gadget_path, "UDC"), "\n")
 
-    _unlink(join(gadget_path, "os_desc/c.1"), True)
+    _unlink(join(gadget_path, "os_desc", usb.G_PROFILE_NAME), True)
 
-    profile_path = join(gadget_path, "configs/c.1")
+    profile_path = join(gadget_path, usb.G_PROFILE)
     for func in os.listdir(profile_path):
         if re.search(r"\.usb\d+$", func):
             _unlink(join(profile_path, func))
diff --git a/kvmd/apps/otgconf/__init__.py b/kvmd/apps/otgconf/__init__.py
index 5e765a99..96aa83f0 100644
--- a/kvmd/apps/otgconf/__init__.py
+++ b/kvmd/apps/otgconf/__init__.py
@@ -31,25 +31,16 @@ from typing import Optional
 
 from ...validators.basic import valid_stripped_string_not_empty
 
-from ... import env
 from ... import usb
 
 from .. import init
 
 
 # =====
-def _make_config_path(gadget: str, func: str) -> str:
-    return os.path.join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", gadget, "configs/c.1", func)
-
-
-def _make_func_path(gadget: str, func: str) -> str:
-    return os.path.join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", gadget, "functions", func)
-
-
 @contextlib.contextmanager
 def _udc_stopped(gadget: str, udc: str) -> Generator[None, None, None]:
     udc = usb.find_udc(udc)
-    udc_path = os.path.join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", gadget, "UDC")
+    udc_path = usb.get_gadget_path(gadget, usb.G_UDC)
     with open(udc_path) as udc_file:
         enabled = bool(udc_file.read().strip())
     if enabled:
@@ -65,19 +56,22 @@ def _udc_stopped(gadget: str, udc: str) -> Generator[None, None, None]:
 
 def _enable_function(gadget: str, udc: str, func: str) -> None:
     with _udc_stopped(gadget, udc):
-        os.symlink(_make_func_path(gadget, func), _make_config_path(gadget, func))
+        os.symlink(
+            usb.get_gadget_path(gadget, usb.G_FUNCTIONS, func),
+            usb.get_gadget_path(gadget, usb.G_PROFILE, func),
+        )
 
 
 def _disable_function(gadget: str, udc: str, func: str) -> None:
     with _udc_stopped(gadget, udc):
-        os.unlink(_make_config_path(gadget, func))
+        os.unlink(usb.get_gadget_path(gadget, usb.G_PROFILE, func))
 
 
 def _list_functions(gadget: str, meta_path: str) -> None:
     for meta_name in sorted(os.listdir(meta_path)):
         with open(os.path.join(meta_path, meta_name)) as meta_file:
             meta = json.loads(meta_file.read())
-        enabled = os.path.exists(_make_config_path(gadget, meta["func"]))
+        enabled = os.path.exists(usb.get_gadget_path(gadget, usb.G_PROFILE, meta["func"]))
         print(f"{'+' if enabled else '-'} {meta['func']}  # {meta['name']}")
 
 
diff --git a/kvmd/apps/otgmsd/__init__.py b/kvmd/apps/otgmsd/__init__.py
index f87d5985..5187a72d 100644
--- a/kvmd/apps/otgmsd/__init__.py
+++ b/kvmd/apps/otgmsd/__init__.py
@@ -34,29 +34,24 @@ from ...validators.basic import valid_bool
 from ...validators.basic import valid_int_f0
 from ...validators.os import valid_abs_file
 
-from ... import env
+from ... import usb
 
 from .. import init
 
 
 # =====
-def _make_param_path(gadget: str, instance: int, param: str) -> str:
-    return os.path.join(
-        f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget",
-        gadget,
-        f"functions/mass_storage.usb{instance}/lun.0",
-        param,
-    )
+def _get_param_path(gadget: str, instance: int, param: str) -> str:
+    return usb.get_gadget_path(gadget, usb.G_FUNCTIONS, f"mass_storage.usb{instance}/lun.0", param)
 
 
 def _get_param(gadget: str, instance: int, param: str) -> str:
-    with open(_make_param_path(gadget, instance, param)) as param_file:
+    with open(_get_param_path(gadget, instance, param)) as param_file:
         return param_file.read().strip()
 
 
 def _set_param(gadget: str, instance: int, param: str, value: str) -> None:
     try:
-        with open(_make_param_path(gadget, instance, param), "w") as param_file:
+        with open(_get_param_path(gadget, instance, param), "w") as param_file:
             param_file.write(value + "\n")
     except OSError as err:
         if err.errno == errno.EBUSY:
diff --git a/kvmd/apps/otgnet/__init__.py b/kvmd/apps/otgnet/__init__.py
index ad1f6a28..3f2d99b8 100644
--- a/kvmd/apps/otgnet/__init__.py
+++ b/kvmd/apps/otgnet/__init__.py
@@ -20,7 +20,6 @@
 # ========================================================================== #
 
 
-import os
 import asyncio
 import ipaddress
 import dataclasses
@@ -34,9 +33,9 @@ from ...logging import get_logger
 
 from ...yamlconf import Section
 
-from ... import env
 from ... import tools
 from ... import aioproc
+from ... import usb
 
 from .. import init
 
@@ -176,11 +175,7 @@ class _Service:  # pylint: disable=too-many-instance-attributes
         real_driver = self.__driver
         if self.__driver == "rndis5":
             real_driver = "rndis"
-        path = env.SYSFS_PREFIX + os.path.join(
-            "/sys/kernel/config/usb_gadget",
-            self.__gadget,
-            f"functions/{real_driver}.usb0/ifname",
-        )
+        path = usb.get_gadget_path(self.__gadget, usb.G_FUNCTIONS, f"{real_driver}.usb0/ifname")
         logger.info("Using OTG gadget %r ...", self.__gadget)
         with open(path) as iface_file:
             iface = iface_file.read().strip()