CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update scanning in web interface

Browse Source
This commit is contained in:
UpstreamData
2022-05-18 11:39:14 -06:00
parent 8cbf3a20a3
commit 85b282740a
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/web_monitor/scan/func.py
View File

@@ -5,7 +5,6 @@ from fastapi import WebSocket
from network import MinerNetwork from network import MinerNetwork
from tools.web_monitor.func import get_current_miner_list from tools.web_monitor.func import get_current_miner_list
import ipaddress import ipaddress
from miners.miner_factory import MinerFactory
async def do_websocket_scan(websocket: WebSocket, network_ip: str): async def do_websocket_scan(websocket: WebSocket, network_ip: str):
@@ -20,20 +19,11 @@ async def do_websocket_scan(websocket: WebSocket, network_ip: str):
all_miners = [] all_miners = []
async for found_miner in miner_generator: async for found_miner in miner_generator:
if found_miner and str(found_miner.ip) not in cur_miners: if found_miner and str(found_miner.ip) not in cur_miners:
# all_miners.append(miner_ip)
# get_miner_generator = MinerFactory().get_miner_generator(miners)
# async for found_miner in get_miner_generator:
all_miners.append( all_miners.append(
{"ip": found_miner.ip, "model": await found_miner.get_model()} {"ip": str(found_miner.ip), "model": await found_miner.get_model()}
) )
all_miners.sort(key=lambda x: ipaddress.ip_address(x["ip"])) all_miners.sort(key=lambda x: ipaddress.ip_address(x["ip"]))
send_miners = [] await websocket.send_json(all_miners)
for miner_ip in all_miners:
send_miners.append(
{"ip": str(miner_ip["ip"]), "model": miner_ip["model"]}
)
await websocket.send_json(send_miners)
await websocket.send_text("Done") await websocket.send_text("Done")
except asyncio.CancelledError: except asyncio.CancelledError:
raise raise