refactoring

kvmd/apps/kvmd/api/msd.py

@@ -60,14 +60,9 @@ class MsdApi:
         await self.__msd.set_params(**params)  # type: ignore
         return make_json_response()
 
-    @exposed_http("POST", "/msd/connect")
+    @exposed_http("POST", "/msd/set_connected")
-    async def __connect_handler(self, _: Request) -> Response:
+    async def __set_connected_handler(self, request: Request) -> Response:
-        await self.__msd.connect()
+        await self.__msd.set_connected(valid_bool(request.query.get("connected")))
-        return make_json_response()
-
-    @exposed_http("POST", "/msd/disconnect")
-    async def __disconnect_handler(self, _: Request) -> Response:
-        await self.__msd.disconnect()
         return make_json_response()
 
     @exposed_http("POST", "/msd/write")

kvmd/plugins/msd/__init__.py

@@ -109,10 +109,7 @@ class BaseMsd(BasePlugin):
     async def set_params(self, name: Optional[str]=None, cdrom: Optional[bool]=None) -> None:
         raise NotImplementedError()
 
-    async def connect(self) -> None:
+    async def set_connected(self, connected: bool) -> None:
-        raise NotImplementedError()
-
-    async def disconnect(self) -> None:
         raise NotImplementedError()
 
     @contextlib.asynccontextmanager

kvmd/plugins/msd/disabled.py

@@ -66,10 +66,7 @@ class Plugin(BaseMsd):
     async def set_params(self, name: Optional[str]=None, cdrom: Optional[bool]=None) -> None:
         raise MsdDisabledError()
 
-    async def connect(self) -> None:
+    async def set_connected(self, connected: bool) -> None:
-        raise MsdDisabledError()
-
-    async def disconnect(self) -> None:
         raise MsdDisabledError()
 
     @contextlib.asynccontextmanager

kvmd/plugins/msd/otg/__init__.py

@@ -255,36 +255,32 @@ class Plugin(BaseMsd):  # pylint: disable=too-many-instance-attributes
                 self.__state.vd.cdrom = cdrom
 
     @aiotools.atomic
-    async def connect(self) -> None:
+    async def set_connected(self, connected: bool) -> None:
         async with self.__state.busy():
             assert self.__state.vd
+            if connected:
+                if self.__state.vd.connected or self.__drive.get_image_path():
+                    raise MsdConnectedError()
+                if self.__state.vd.image is None:
+                    raise MsdImageNotSelected()
 
-            if self.__state.vd.connected or self.__drive.get_image_path():
+                assert self.__state.vd.image.in_storage
-                raise MsdConnectedError()
-            if self.__state.vd.image is None:
-                raise MsdImageNotSelected()
 
-            assert self.__state.vd.image.in_storage
+                if not os.path.exists(self.__state.vd.image.path):
+                    raise MsdUnknownImageError()
 
-            if not os.path.exists(self.__state.vd.image.path):
+                await self.__unlock_drive()
-                raise MsdUnknownImageError()
+                self.__drive.set_cdrom_flag(self.__state.vd.cdrom)
+                self.__drive.set_image_path(self.__state.vd.image.path)
 
-            await self.__unlock_drive()
+            else:
-            self.__drive.set_cdrom_flag(self.__state.vd.cdrom)
+                if not (self.__state.vd.connected or self.__drive.get_image_path()):
-            self.__drive.set_image_path(self.__state.vd.image.path)
+                    raise MsdDisconnectedError()
-            self.__state.vd.connected = True
 
-    @aiotools.atomic
+                await self.__unlock_drive()
-    async def disconnect(self) -> None:
+                self.__drive.set_image_path("")
-        async with self.__state.busy():
-            assert self.__state.vd
 
-            if not (self.__state.vd.connected or self.__drive.get_image_path()):
+            self.__state.vd.connected = connected
-                raise MsdDisconnectedError()
-
-            await self.__unlock_drive()
-            self.__drive.set_image_path("")
-            self.__state.vd.connected = False
 
     @contextlib.asynccontextmanager
     async def write_image(self, name: str) -> AsyncGenerator[None, None]:

kvmd/plugins/msd/relay/__init__.py

@@ -176,32 +176,26 @@ class Plugin(BaseMsd):  # pylint: disable=too-many-instance-attributes
                 raise MsdCdromNotSupported()
 
     @aiotools.atomic
-    async def connect(self) -> None:
+    async def set_connected(self, connected: bool) -> None:
         async with self.__working():
             async with self.__region:
-                if self.__connected:
+                if connected:
-                    raise MsdConnectedError()
-
-                self.__gpio.switch_to_server()
-                self.__connected = True
-                get_logger(0).info("MSD switched to Server")
-
-    @aiotools.atomic
-    async def disconnect(self) -> None:
-        async with self.__working():
-            async with self.__region:
-                if not self.__connected:
-                    raise MsdDisconnectedError()
-
-                self.__gpio.switch_to_local()
-                try:
-                    await self.__load_device_info()
-                except Exception:
                     if self.__connected:
-                        self.__gpio.switch_to_server()
+                        raise MsdConnectedError()
-                    raise
+                    self.__gpio.switch_to_server()
-                self.__connected = False
+                    get_logger(0).info("MSD switched to Server")
-                get_logger(0).info("MSD switched to KVM: %s", self.__device_info)
+                else:
+                    if not self.__connected:
+                        raise MsdDisconnectedError()
+                    self.__gpio.switch_to_local()
+                    try:
+                        await self.__load_device_info()
+                    except Exception:
+                        if self.__connected:
+                            self.__gpio.switch_to_server()
+                        raise
+                    get_logger(0).info("MSD switched to KVM: %s", self.__device_info)
+                self.__connected = connected
 
     @contextlib.asynccontextmanager
     async def write_image(self, name: str) -> AsyncGenerator[None, None]:

web/share/js/kvm/msd.js

@@ -138,9 +138,8 @@ export function Msd() {
 		tools.progressSetValue($("msd-uploading-progress"), "Aborted", 0);
 	};
 
-	var __clickConnectButton = function(connect) {
+	var __clickConnectButton = function(connected) {
-		let action = (connect ? "connect" : "disconnect");
+		let http = tools.makeRequest("POST", `/api/msd/set_connected?connected=${connected}`, function() {
-		let http = tools.makeRequest("POST", `/api/msd/${action}`, function() {
 			if (http.readyState === 4) {
 				if (http.status !== 200) {
 					wm.error("Switch error:<br>", http.responseText);
@@ -149,7 +148,7 @@ export function Msd() {
 			__applyState();
 		});
 		__applyState();
-		wm.switchEnabled($(`msd-${action}-button`), false);
+		wm.switchEnabled($(`msd-${connected ? "connect" : "disconnect"}-button`), false);
 	};
 
 	var __selectNewImageFile = function() {