GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

otg msd: handle functions switching

Browse Source
This commit is contained in:
Maxim Devaev 2022-03-31 11:54:31 +03:00
parent 03a4c13291
commit 6828a0e6aa
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/plugins/msd/otg/__init__.py
View File

@ -216,7 +216,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
return { return {
"enabled": True, "enabled": True,
"online": bool(self.__state.vd), "online": (bool(self.__state.vd) and self.__drive.is_enabled()),
"busy": self.__state.is_busy(), "busy": self.__state.is_busy(),
"storage": storage, "storage": storage,
"drive": vd, "drive": vd,
@ -405,7 +405,8 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
with Inotify() as inotify: with Inotify() as inotify:
inotify.watch(self.__images_path, InotifyMask.ALL_MODIFY_EVENTS) inotify.watch(self.__images_path, InotifyMask.ALL_MODIFY_EVENTS)
inotify.watch(self.__meta_path, InotifyMask.ALL_MODIFY_EVENTS) inotify.watch(self.__meta_path, InotifyMask.ALL_MODIFY_EVENTS)
inotify.watch(self.__drive.get_sysfs_path(), InotifyMask.ALL_MODIFY_EVENTS) for path in self.__drive.get_watchable_paths():
inotify.watch(path, InotifyMask.ALL_MODIFY_EVENTS)
# После установки вотчеров еще раз проверяем стейт, чтобы ничего не потерять # После установки вотчеров еще раз проверяем стейт, чтобы ничего не потерять
await self.__reload_state() await self.__reload_state()

21
kvmd/plugins/msd/otg/drive.py
View File

@ -23,6 +23,8 @@
import os import os
import errno import errno
from typing import List
from .... import env from .... import env
from .. import MsdOperationError from .. import MsdOperationError
@ -37,14 +39,23 @@ class MsdDriveLockedError(MsdOperationError):
# ===== # =====
class Drive: class Drive:
def __init__(self, gadget: str, instance: int, lun: int) -> None: def __init__(self, gadget: str, instance: int, lun: int) -> None:
self.__path = os.path.join( self.__lun_path = os.path.join(
f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget",
gadget, gadget,
f"functions/mass_storage.usb{instance}/lun.{lun}", f"functions/mass_storage.usb{instance}/lun.{lun}",
) )
self.__configs_root_path = os.path.join(
f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget",
gadget,
"configs/c.1",
)
self.__func_path = os.path.join(self.__configs_root_path, f"mass_storage.usb{instance}")
def get_sysfs_path(self) -> str: def is_enabled(self) -> bool:
return self.__path return os.path.exists(self.__func_path)
def get_watchable_paths(self) -> List[str]:
return [self.__lun_path, self.__configs_root_path]
# ===== # =====
@ -69,12 +80,12 @@ class Drive:
# ===== # =====
def __get_param(self, param: str) -> str: def __get_param(self, param: str) -> str:
with open(os.path.join(self.__path, param)) as param_file: with open(os.path.join(self.__lun_path, param)) as param_file:
return param_file.read().strip() return param_file.read().strip()
def __set_param(self, param: str, value: str) -> None: def __set_param(self, param: str, value: str) -> None:
try: try:
with open(os.path.join(self.__path, param), "w") as param_file: with open(os.path.join(self.__lun_path, param), "w") as param_file:
param_file.write(value + "\n") param_file.write(value + "\n")
except OSError as err: except OSError as err:
if err.errno == errno.EBUSY: if err.errno == errno.EBUSY: