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

fixed some small bugs with whatsminers and progress bar

Browse Source
This commit is contained in:
UpstreamData
2022-05-11 13:20:14 -06:00
parent 4eb51eed20
commit e9a1483e5f
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
API/__init__.py
View File

@@ -193,6 +193,8 @@ If you are sure you want to use this command please use API.send_command("{item}
str_data = str_data.replace("}{", "},{") str_data = str_data.replace("}{", "},{")
# fix an error with a bmminer return having a specific comma that breaks json.loads() # fix an error with a bmminer return having a specific comma that breaks json.loads()
str_data = str_data.replace("[,{", "[{") str_data = str_data.replace("[,{", "[{")
# fix an error with a btminer return having a specific comma that breaks json.loads()
str_data = str_data.replace("inf", "0")
# parse the json # parse the json
parsed_data = json.loads(str_data) parsed_data = json.loads(str_data)
# handle bad json # handle bad json

2
tools/cfg_util/configure/__init__.py
View File

@@ -32,7 +32,7 @@ async def btn_config(table, selected, config: str, last_oct_ip: bool):
async def send_config(ips: list, config: str, last_octet_ip: bool): async def send_config(ips: list, config: str, last_octet_ip: bool):
global progress_bar_len global progress_bar_len
progress_bar_len = 0 progress_bar_len = 0
await update_prog_bar(progress_bar_len, max=(2 * len(ips))) await update_prog_bar(progress_bar_len, _max=(2 * len(ips)))
get_miner_genenerator = MinerFactory().get_miner_generator(ips) get_miner_genenerator = MinerFactory().get_miner_generator(ips)
all_miners = [] all_miners = []
async for miner in get_miner_genenerator: async for miner in get_miner_genenerator:

2
tools/cfg_util/general/__init__.py
View File

@@ -70,7 +70,7 @@ async def update_miners_data(miners: list):
global progress_bar_len global progress_bar_len
progress_bar_len = 0 progress_bar_len = 0
await update_prog_bar(progress_bar_len, max=len(miners)) await update_prog_bar(progress_bar_len, _max=len(miners))
data_generator = asyncio.as_completed( data_generator = asyncio.as_completed(
[_get_data(await MinerFactory().get_miner(miner)) for miner in miners] [_get_data(await MinerFactory().get_miner(miner)) for miner in miners]
) )

6
tools/cfg_util/tables.py
View File

@@ -137,11 +137,11 @@ class TableManager(metaclass=Singleton):
item[ item[
"Hashrate" "Hashrate"
] = f"{format(float(item['Hashrate']), '.2f').rjust(6, ' ')} TH/s" ] = f"{format(float(item['Hashrate']), '.2f').rjust(6, ' ')} TH/s"
for key in keys: for _key in keys:
for table in TABLE_HEADERS.keys(): for table in TABLE_HEADERS.keys():
for idx, header in enumerate(TABLE_HEADERS[table]): for idx, header in enumerate(TABLE_HEADERS[table]):
if key == header: if _key == header:
tables[table][data_idx][idx] = item[key] tables[table][data_idx][idx] = item[_key]
window["scan_table"].update(tables["SCAN"]) window["scan_table"].update(tables["SCAN"])
window["pools_table"].update(tables["POOLS_ALL"]) window["pools_table"].update(tables["POOLS_ALL"])