GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

aiohelpers

Browse Source
This commit is contained in:
Maxim Devaev
2022-04-10 08:08:05 +03:00
parent c92d17dea2
commit 7c44d733a9
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ from ....validators.os import valid_printable_filename
from ....validators.os import valid_command
from .... import aiotools
from .... import aiohelpers
from .. import MsdError
from .. import MsdIsBusyError
@@ -59,7 +60,6 @@ from .. import BaseMsd
from .. import MsdImageWriter
from . import fs
from . import helpers
from .drive import Drive
@@ -538,4 +538,5 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
# =====
async def __remount_storage(self, rw: bool) -> None:
await helpers.remount_storage(self.__remount_cmd, rw)
if not (await aiohelpers.remount("MSD", self.__remount_cmd, rw)):
raise MsdError("Can't execute remount helper")

54
kvmd/plugins/msd/otg/helpers.py
View File

@@ -1,54 +0,0 @@
# ========================================================================== #
# #
# KVMD - The main PiKVM daemon. #
# #
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #
from typing import List
from ....logging import get_logger
from .... import aioproc
from .. import MsdError
# =====
async def remount_storage(base_cmd: List[str], rw: bool) -> None:
logger = get_logger(0)
mode = ("rw" if rw else "ro")
cmd = [
part.format(mode=mode)
for part in base_cmd
]
logger.info("Remounting internal storage to %s ...", mode.upper())
try:
await _run_helper(cmd)
except Exception:
logger.error("Can't remount internal storage")
raise
# =====
async def _run_helper(cmd: List[str]) -> None:
logger = get_logger(0)
logger.info("Executing helper %s ...", cmd)
proc = await aioproc.log_process(cmd, logger)
if proc.returncode != 0:
raise MsdError(f"Error while helper execution: pid={proc.pid}; retcode={proc.returncode}")