From 4c9c98c6ab638bf744c119102a70dff8ee930305 Mon Sep 17 00:00:00 2001
From: Maxim Devaev <mdevaev@gmail.com>
Date: Mon, 10 Feb 2025 00:55:33 +0200
Subject: [PATCH] refactoring

---
 kvmd/apps/pstrun/__init__.py | 18 +++++++++---------
 kvmd/clients/kvmd.py         | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kvmd/apps/pstrun/__init__.py b/kvmd/apps/pstrun/__init__.py
index d55835fd..a0e5b702 100644
--- a/kvmd/apps/pstrun/__init__.py
+++ b/kvmd/apps/pstrun/__init__.py
@@ -66,22 +66,22 @@ async def _run_process(cmd: list[str], data_path: str) -> asyncio.subprocess.Pro
 
 async def _run_cmd_ws(cmd: list[str], ws: aiohttp.ClientWebSocketResponse) -> int:  # pylint: disable=too-many-branches
     logger = get_logger(0)
-    receive_task: (asyncio.Task | None) = None
+    recv_task: (asyncio.Task | None) = None
     proc_task: (asyncio.Task | None) = None
     proc: (asyncio.subprocess.Process | None) = None  # pylint: disable=no-member
 
     try:  # pylint: disable=too-many-nested-blocks
         while True:
-            if receive_task is None:
-                receive_task = asyncio.create_task(ws.receive())
+            if recv_task is None:
+                recv_task = asyncio.create_task(ws.receive())
             if proc_task is None and proc is not None:
                 proc_task = asyncio.create_task(proc.wait())
 
-            tasks = list(filter(None, [receive_task, proc_task]))
+            tasks = list(filter(None, [recv_task, proc_task]))
             done = (await aiotools.wait_first(*tasks))[0]
 
-            if receive_task in done:
-                msg = receive_task.result()
+            if recv_task in done:
+                msg = recv_task.result()
                 if msg.type == aiohttp.WSMsgType.TEXT:
                     (event_type, event) = htserver.parse_ws_event(msg.data)
                     if event_type == "storage":
@@ -98,15 +98,15 @@ async def _run_cmd_ws(cmd: list[str], ws: aiohttp.ClientWebSocketResponse) -> in
                 else:
                     logger.error("Unknown PST message type: %r", msg)
                     break
-                receive_task = None
+                recv_task = None
 
             if proc_task in done:
                 break
     except Exception:
         logger.exception("Unhandled exception")
 
-    if receive_task is not None:
-        receive_task.cancel()
+    if recv_task is not None:
+        recv_task.cancel()
     if proc_task is not None:
         proc_task.cancel()
     if proc is not None:
diff --git a/kvmd/clients/kvmd.py b/kvmd/clients/kvmd.py
index aef52e93..a7d67532 100644
--- a/kvmd/clients/kvmd.py
+++ b/kvmd/clients/kvmd.py
@@ -140,19 +140,19 @@ class KvmdClientWs:
     async def communicate(self) -> AsyncGenerator[tuple[str, dict], None]:  # pylint: disable=too-many-branches
         assert not self.__communicated
         self.__communicated = True
-        receive_task: (asyncio.Task | None) = None
+        recv_task: (asyncio.Task | None) = None
         writer_task: (asyncio.Task | None) = None
         try:
             while True:
-                if receive_task is None:
-                    receive_task = asyncio.create_task(self.__ws.receive())
+                if recv_task is None:
+                    recv_task = asyncio.create_task(self.__ws.receive())
                 if writer_task is None:
                     writer_task = asyncio.create_task(self.__writer_queue.get())
 
-                done = (await aiotools.wait_first(receive_task, writer_task))[0]
+                done = (await aiotools.wait_first(recv_task, writer_task))[0]
 
-                if receive_task in done:
-                    msg = receive_task.result()
+                if recv_task in done:
+                    msg = recv_task.result()
                     if msg.type == aiohttp.WSMsgType.TEXT:
                         yield htserver.parse_ws_event(msg.data)
                     elif msg.type == aiohttp.WSMsgType.CLOSE:
@@ -161,7 +161,7 @@ class KvmdClientWs:
                         break
                     else:
                         raise RuntimeError(f"Unhandled WS message type: {msg!r}")
-                    receive_task = None
+                    recv_task = None
 
                 if writer_task in done:
                     payload = writer_task.result()
@@ -171,8 +171,8 @@ class KvmdClientWs:
                         await htserver.send_ws_event(self.__ws, *payload)
                     writer_task = None
         finally:
-            if receive_task:
-                receive_task.cancel()
+            if recv_task:
+                recv_task.cancel()
             if writer_task:
                 writer_task.cancel()
             try: