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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev 2024-10-24 03:05:46 +03:00
parent 1ebc08eae8
commit 399712c684
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,9 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
for name in list(storage["parts"]): for name in list(storage["parts"]):
del storage["parts"][name]["name"] del storage["parts"][name]["name"]
storage["size"] = storage["parts"][""]["size"] # Legacy API
storage["free"] = storage["parts"][""]["free"] # Legacy API
storage["downloading"] = (self.__reader.get_state() if self.__reader else None) storage["downloading"] = (self.__reader.get_state() if self.__reader else None)
storage["uploading"] = (self.__writer.get_state() if self.__writer else None) storage["uploading"] = (self.__writer.get_state() if self.__writer else None)

13
kvmd/plugins/msd/otg/storage.py
View File

@ -169,8 +169,6 @@ class _Part(_PartDc):
# ===== # =====
@dataclasses.dataclass(frozen=True, eq=False) @dataclasses.dataclass(frozen=True, eq=False)
class _StorageDc: class _StorageDc:
size: int = dataclasses.field(init=False)
free: int = dataclasses.field(init=False)
images: dict[str, Image] = dataclasses.field(init=False) images: dict[str, Image] = dataclasses.field(init=False)
parts: dict[str, _Part] = dataclasses.field(init=False) parts: dict[str, _Part] = dataclasses.field(init=False)
@ -185,16 +183,6 @@ class Storage(_StorageDc):
self.__images: (dict[str, Image] | None) = None self.__images: (dict[str, Image] | None) = None
self.__parts: (dict[str, _Part] | None) = None self.__parts: (dict[str, _Part] | None) = None
@property
def size(self) -> int: # API Legacy
assert self.__parts is not None
return self.__parts[""].size
@property
def free(self) -> int: # API Legacy
assert self.__parts is not None
return self.__parts[""].free
@property @property
def images(self) -> dict[str, Image]: def images(self) -> dict[str, Image]:
assert self.__images is not None assert self.__images is not None
@ -222,6 +210,7 @@ class Storage(_StorageDc):
part = _Part(name, root_path) part = _Part(name, root_path)
await part._reload() # pylint: disable=protected-access await part._reload() # pylint: disable=protected-access
parts[name] = part parts[name] = part
assert "" in parts, parts
self.__watchable_paths = watchable_paths self.__watchable_paths = watchable_paths
self.__images = images self.__images = images