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

removed some msd api legacy

Browse Source
This commit is contained in:
Maxim Devaev 2023-03-18 03:40:57 +02:00
parent 18a8e5c9ef
commit 03ce7bfd2c
5 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/plugins/msd/disabled.py
View File

@ -47,11 +47,6 @@ class Plugin(BaseMsd):
"busy": False, "busy": False,
"storage": None, "storage": None,
"drive": None, "drive": None,
"features": {
"multi": False,
"cdrom": False,
"rw": False,
},
} }
async def poll_state(self) -> AsyncGenerator[dict, None]: async def poll_state(self) -> AsyncGenerator[dict, None]:

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

@ -173,8 +173,11 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
storage = dataclasses.asdict(self.__state.storage) storage = dataclasses.asdict(self.__state.storage)
for name in list(storage["images"]): for name in list(storage["images"]):
del storage["images"][name]["name"]
del storage["images"][name]["path"] del storage["images"][name]["path"]
del storage["images"][name]["in_storage"] del storage["images"][name]["in_storage"]
for name in list(storage["parts"]):
del storage["parts"][name]["name"]
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)
@ -191,11 +194,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
"busy": self.__state.is_busy(), "busy": self.__state.is_busy(),
"storage": storage, "storage": storage,
"drive": vd, "drive": vd,
"features": {
"multi": True,
"cdrom": True,
"rw": True,
},
} }
async def poll_state(self) -> AsyncGenerator[dict, None]: async def poll_state(self) -> AsyncGenerator[dict, None]:

6
web/kvm/index.html
View File

@ -476,7 +476,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="kv msd-cdrom-emulation feature-disabled"> <table class="kv">
<tr> <tr>
<td>Drive <a target="_blank" href="https://docs.pikvm.org/msd">mode</a>:</td> <td>Drive <a target="_blank" href="https://docs.pikvm.org/msd">mode</a>:</td>
<td> <td>
@ -488,8 +488,8 @@
</div> </div>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td class="msd-rw feature-disabled">Writable:</td> <td>Writable:</td>
<td class="msd-rw feature-disabled" align="right"> <td align="right">
<div class="switch-box"> <div class="switch-box">
<input disabled type="checkbox" id="msd-rw-switch"> <input disabled type="checkbox" id="msd-rw-switch">
<label for="msd-rw-switch"><span class="switch-inner"></span><span class="switch"></span></label> <label for="msd-rw-switch"><span class="switch-inner"></span><span class="switch"></span></label>

4
web/kvm/navbar-msd.pug
View File

@ -39,7 +39,7 @@ li(id="msd-dropdown" class="right feature-disabled")
td(width="100%") #[select(disabled id="msd-image-selector")] td(width="100%") #[select(disabled id="msd-image-selector")]
td #[button(disabled id="msd-download-button" title="Download image") &nbsp;&nbsp;&#128426;&nbsp;&nbsp;] td #[button(disabled id="msd-download-button" title="Download image") &nbsp;&nbsp;&#128426;&nbsp;&nbsp;]
td #[button(disabled id="msd-remove-button" title="Remove image") #[b &nbsp;&nbsp;&times;&nbsp;&nbsp;]] td #[button(disabled id="msd-remove-button" title="Remove image") #[b &nbsp;&nbsp;&times;&nbsp;&nbsp;]]
table(class="kv msd-cdrom-emulation feature-disabled") table(class="kv")
tr tr
td Drive #[a(target="_blank" href="https://docs.pikvm.org/msd") mode]: td Drive #[a(target="_blank" href="https://docs.pikvm.org/msd") mode]:
td td
@ -49,7 +49,7 @@ li(id="msd-dropdown" class="right feature-disabled")
input(type="radio" id="msd-mode-radio-flash" name="msd-mode-radio" value="0") input(type="radio" id="msd-mode-radio-flash" name="msd-mode-radio" value="0")
label(for="msd-mode-radio-flash") Flash label(for="msd-mode-radio-flash") Flash
td &nbsp; td &nbsp;
+menu_switch_notable("msd-rw-switch", "Writable", false, false, "msd-rw feature-disabled") +menu_switch_notable("msd-rw-switch", "Writable", false, false)
hr hr
div(class="text") div(class="text")
div(id="msd-storage-progress" class="progress") div(id="msd-storage-progress" class="progress")

28
web/share/js/kvm/msd.js
View File

@ -215,8 +215,8 @@ export function Msd() {
let file = tools.input.getFile($("msd-new-file")); let file = tools.input.getFile($("msd-new-file"));
if (file) { if (file) {
$("msd-new-url").value = ""; $("msd-new-url").value = "";
if (file.size > __state.storage.size) { if (file.size > __state.storage.parts[""].size) {
wm.error("New image is too big for your Mass Storage Drive.<br>Maximum:", tools.formatSize(__state.storage.size)); wm.error("New image is too big for your Mass Storage Drive.<br>Maximum:", tools.formatSize(__state.storage.parts[""].size));
el_input.value = ""; el_input.value = "";
} }
} }
@ -238,10 +238,10 @@ export function Msd() {
let online = (s && s.online); let online = (s && s.online);
if (online) { if (online) {
let size_str = tools.formatSize(s.storage.size); let size_str = tools.formatSize(s.storage.parts[""].size);
let used = s.storage.size - s.storage.free; let used = s.storage.parts[""].size - s.storage.parts[""].free;
let used_str = tools.formatSize(used); let used_str = tools.formatSize(used);
let percent = used / s.storage.size * 100; let percent = used / s.storage.parts[""].size * 100;
tools.progress.setValue($("msd-storage-progress"), `Storage: ${used_str} of ${size_str}`, percent); tools.progress.setValue($("msd-storage-progress"), `Storage: ${used_str} of ${size_str}`, percent);
} else { } else {
tools.progress.setValue($("msd-storage-progress"), "Storage: unavailable", 0); tools.progress.setValue($("msd-storage-progress"), "Storage: unavailable", 0);
@ -252,11 +252,11 @@ export function Msd() {
tools.el.setEnabled($("msd-download-button"), (online && s.drive.image && !s.drive.connected && !s.busy)); tools.el.setEnabled($("msd-download-button"), (online && s.drive.image && !s.drive.connected && !s.busy));
tools.el.setEnabled($("msd-remove-button"), (online && s.drive.image && s.drive.image.removable && !s.drive.connected && !s.busy)); tools.el.setEnabled($("msd-remove-button"), (online && s.drive.image && s.drive.image.removable && !s.drive.connected && !s.busy));
tools.radio.setEnabled("msd-mode-radio", (online && s.features.cdrom && !s.drive.connected && !s.busy)); tools.radio.setEnabled("msd-mode-radio", (online && !s.drive.connected && !s.busy));
tools.radio.setValue("msd-mode-radio", `${Number(online && s.features.cdrom && s.drive.cdrom)}`); tools.radio.setValue("msd-mode-radio", `${Number(online && s.drive.cdrom)}`);
tools.el.setEnabled($("msd-rw-switch"), (online && s.features.rw && !s.drive.connected && !s.busy)); tools.el.setEnabled($("msd-rw-switch"), (online && !s.drive.connected && !s.busy));
$("msd-rw-switch").checked = (online && s.features.rw && s.drive.rw); $("msd-rw-switch").checked = (online && s.drive.rw);
tools.el.setEnabled($("msd-connect-button"), (online && s.drive.image && !s.drive.connected && !s.busy)); tools.el.setEnabled($("msd-connect-button"), (online && s.drive.image && !s.drive.connected && !s.busy));
tools.el.setEnabled($("msd-disconnect-button"), (online && s.drive.connected && !s.busy)); tools.el.setEnabled($("msd-disconnect-button"), (online && s.drive.connected && !s.busy));
@ -295,23 +295,17 @@ export function Msd() {
if (s) { if (s) {
tools.feature.setEnabled($("msd-dropdown"), s.enabled); tools.feature.setEnabled($("msd-dropdown"), s.enabled);
tools.feature.setEnabled($("msd-reset-button"), s.enabled); tools.feature.setEnabled($("msd-reset-button"), s.enabled);
for (let el of $$$(".msd-cdrom-emulation")) {
tools.feature.setEnabled(el, s.features.cdrom);
}
for (let el of $$$(".msd-rw")) {
tools.feature.setEnabled(el, s.features.rw);
}
} }
tools.hidden.setVisible($("msd-message-offline"), (s && !s.online)); tools.hidden.setVisible($("msd-message-offline"), (s && !s.online));
tools.hidden.setVisible($("msd-message-image-broken"), tools.hidden.setVisible($("msd-message-image-broken"),
(online && s.drive.image && !s.drive.image.complete && !s.storage.uploading)); (online && s.drive.image && !s.drive.image.complete && !s.storage.uploading));
tools.hidden.setVisible($("msd-message-too-big-for-cdrom"), tools.hidden.setVisible($("msd-message-too-big-for-cdrom"),
(online && s.features.cdrom && s.drive.cdrom && s.drive.image && s.drive.image.size >= 2359296000)); (online && s.drive.cdrom && s.drive.image && s.drive.image.size >= 2359296000));
tools.hidden.setVisible($("msd-message-out-of-storage"), tools.hidden.setVisible($("msd-message-out-of-storage"),
(online && s.drive.image && !s.drive.image.in_storage)); (online && s.drive.image && !s.drive.image.in_storage));
tools.hidden.setVisible($("msd-message-rw-enabled"), tools.hidden.setVisible($("msd-message-rw-enabled"),
(online && s.features.rw && s.drive.rw)); (online && s.drive.rw));
tools.hidden.setVisible($("msd-message-another-user-uploads"), tools.hidden.setVisible($("msd-message-another-user-uploads"),
(online && s.storage.uploading && !__http)); (online && s.storage.uploading && !__http));
tools.hidden.setVisible($("msd-message-downloads"), tools.hidden.setVisible($("msd-message-downloads"),