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

improved the functionality of get data greatly

Browse Source
This commit is contained in:
UpstreamData
2022-01-05 09:17:45 -07:00
parent eac2d64468
commit 38f93fa212
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cfg_util/func/__init__.py
View File

@@ -183,25 +183,29 @@ async def export_config_file(file_location, config):
async def get_data(ip_list: list): async def get_data(ip_list: list):
await update_ui_with_data("status", "Getting Data") await update_ui_with_data("status", "Getting Data")
ips = [ipaddress.ip_address(ip) for ip in ip_list] ips = [ipaddress.ip_address(ip) for ip in ip_list]
if len(ips) == 0:
ips = [ipaddress.ip_address(ip) for ip in [item[0] for item in window["ip_table"].Values]]
await set_progress_bar_len(len(ips)) await set_progress_bar_len(len(ips))
progress_bar_len = 0 progress_bar_len = 0
data_gen = asyncio.as_completed([get_formatted_data(miner) for miner in ips]) data_gen = asyncio.as_completed([get_formatted_data(miner) for miner in ips])
miner_data = [] ip_table_data = window["ip_table"].Values
ordered_all_ips = [item[0] for item in ip_table_data]
miner_hr = []
for all_data in data_gen: for all_data in data_gen:
miner_data.append(await all_data) data_point = await all_data
miner_hr.append(data_point["TH/s"])
if data_point["IP"] in ordered_all_ips:
ip_table_index = ordered_all_ips.index(data_point["IP"])
ip_table_data[ip_table_index] = [
data_point["IP"], data_point["host"], str(data_point['TH/s']) + " TH/s", data_point['user'], str(data_point['wattage']) + " W"
]
window["ip_table"].update(ip_table_data)
progress_bar_len += 1 progress_bar_len += 1
asyncio.create_task(update_prog_bar(progress_bar_len)) asyncio.create_task(update_prog_bar(progress_bar_len))
miner_data.sort(key=lambda x: ipaddress.ip_address(x['IP'])) total_hr = round(sum(miner_hr), 2)
total_hr = round(sum(d.get('TH/s', 0) for d in miner_data), 2)
window["hr_total"].update(f"{total_hr} TH/s") window["hr_total"].update(f"{total_hr} TH/s")
table_data = [
[
item["IP"], item["host"], str(item['TH/s']) + " TH/s", item['user'], str(item['wattage']) + " W"
] for item in miner_data
]
await update_ui_with_data("ip_table", table_data)
await update_ui_with_data("status", "") await update_ui_with_data("status", "")