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

improved format and readability

Browse Source
This commit is contained in:
UpstreamData
2021-10-20 13:47:58 -06:00
parent 62ea4578a2
commit ea2ec6463e
14 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config_tool.py
View File

@@ -28,7 +28,8 @@ layout = [
[sg.Listbox([], size=(20, 32), key="ip_list", select_mode='extended')]
]),
sg.Column([
[sg.Text("Data: ", pad=(0, 0)), sg.Button('GET', key="get_data"), sg.Button('SORT IP', key="sort_data_ip"), sg.Button('SORT HR', key="sort_data_hr"), sg.Button('SORT USER', key="sort_data_user")],
[sg.Text("Data: ", pad=(0, 0)), sg.Button('GET', key="get_data"), sg.Button('SORT IP', key="sort_data_ip"),
sg.Button('SORT HR', key="sort_data_hr"), sg.Button('SORT USER', key="sort_data_user")],
[sg.Listbox([], size=(50, 32), key="hr_list")]
]),
sg.Column([
@@ -146,17 +147,18 @@ async def get_data(ip_list: list):
ips.sort()
data = await asyncio.gather(*[get_formatted_data(miner) for miner in ips])
window["hr_list"].update(disabled=False)
window["hr_list"].update([item['IP'] + " | " + str(item['TH/s']) + " TH/s | " + item['user'] for item in data])
window["hr_list"].update([item['IP'] + " | " + str(item['TH/s']) + " TH/s | " + item['user'] + " | " + str(item['wattage']) + " W" for item in data])
window["hr_list"].update(disabled=True)
await update_ui_with_data("status", "")
async def get_formatted_data(ip: ipaddress.ip_address):
miner = await miner_factory.get_miner(ip)
data = await miner.api.multicommand("summary", "pools")
data = await miner.api.multicommand("summary", "pools", "tunerstatus")
wattage = data['tunerstatus'][0]['TUNERSTATUS'][0]['PowerLimit']
mh5s = round(data['summary'][0]['SUMMARY'][0]['MHS 5s'] / 1000000, 2)
user = data['pools'][0]['POOLS'][0]['User']
return {'TH/s': mh5s, 'IP': str(miner.ip), 'user': user}
return {'TH/s': mh5s, 'IP': str(miner.ip), 'user': user, 'wattage': wattage}
async def generate_config():
@@ -195,12 +197,14 @@ async def generate_config():
}
window['config'].update(toml.dumps(config))
async def sort_data(index: int):
await update_ui_with_data("status", "Sorting Data")
data_list = window['hr_list'].Values
new_list = []
for item in data_list:
item_data = [part.strip() for part in item.split("|")]
item_data[3] = item_data[3].replace(" W", "")
item_data[1] = item_data[1].replace(" TH/s", "")
item_data[0] = ipaddress.ip_address(item_data[0])
new_list.append(item_data)
@@ -208,7 +212,11 @@ async def sort_data(index: int):
new_data_list = sorted(new_list, key=lambda x: float(x[index]))
else:
new_data_list = sorted(new_list, key=itemgetter(index))
new_data_list = [str(item[0]) + " | " + item[1] + " TH/s | " + item[2] for item in new_data_list]
new_data_list = [str(item[0]) + " | "
+ item[1] + " TH/s | "
+ item[2] + " | "
+ str(item[3]) + " W"
for item in new_data_list]
window["hr_list"].update(disabled=False)
window["hr_list"].update(new_data_list)
window["hr_list"].update(disabled=True)