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

added indicators of what function is running

Browse Source
This commit is contained in:
UpstreamData
2022-05-06 16:12:17 -06:00
parent c01908ff9a
commit 09660e1934
6 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/cfg_util/cfg_util_qt/commands/__init__.py
View File

@@ -4,7 +4,7 @@ from tools.cfg_util.cfg_util_qt.tables import TableManager
from tools.cfg_util.cfg_util_qt.decorators import disable_buttons from tools.cfg_util.cfg_util_qt.decorators import disable_buttons
@disable_buttons @disable_buttons("Flashing Lights")
async def btn_light(ip_idxs: list): async def btn_light(ip_idxs: list):
table_manager = TableManager() table_manager = TableManager()
_table = window["cmd_table"].Widget _table = window["cmd_table"].Widget
@@ -26,7 +26,7 @@ async def btn_light(ip_idxs: list):
table_manager.update_tables() table_manager.update_tables()
@disable_buttons @disable_buttons("Rebooting")
async def btn_reboot(ip_idxs: list): async def btn_reboot(ip_idxs: list):
table_manager = TableManager() table_manager = TableManager()
_table = window["cmd_table"].Widget _table = window["cmd_table"].Widget
@@ -43,7 +43,7 @@ async def btn_reboot(ip_idxs: list):
table_manager.update_tables() table_manager.update_tables()
@disable_buttons @disable_buttons("Restarting Backend")
async def btn_backend(ip_idxs: list): async def btn_backend(ip_idxs: list):
table_manager = TableManager() table_manager = TableManager()
_table = window["cmd_table"].Widget _table = window["cmd_table"].Widget
@@ -62,7 +62,7 @@ async def btn_backend(ip_idxs: list):
table_manager.update_tables() table_manager.update_tables()
@disable_buttons @disable_buttons("Sending Command")
async def btn_command(ip_idxs: list, command: str): async def btn_command(ip_idxs: list, command: str):
table_manager = TableManager() table_manager = TableManager()
_table = window["cmd_table"].Widget _table = window["cmd_table"].Widget

4
tools/cfg_util/cfg_util_qt/configure/__init__.py
View File

@@ -12,7 +12,7 @@ from tools.cfg_util.cfg_util_qt.general import update_miners_data
progress_bar_len = 0 progress_bar_len = 0
@disable_buttons @disable_buttons("Importing")
async def btn_import(table, selected): async def btn_import(table, selected):
if not len(selected) > 0: if not len(selected) > 0:
return return
@@ -23,7 +23,7 @@ async def btn_import(table, selected):
window["cfg_config_txt"].update(config) window["cfg_config_txt"].update(config)
@disable_buttons @disable_buttons("Configuring")
async def btn_config(table, selected, config: str, last_oct_ip: bool): async def btn_config(table, selected, config: str, last_oct_ip: bool):
ips = [window[table].Values[row][0] for row in selected] ips = [window[table].Values[row][0] for row in selected]
await send_config(ips, config, last_oct_ip) await send_config(ips, config, last_oct_ip)

7
tools/cfg_util/cfg_util_qt/decorators.py
View File

@@ -2,12 +2,14 @@ from tools.cfg_util.cfg_util_qt.layout import window
from tools.cfg_util.cfg_util_qt.layout import BUTTON_KEYS from tools.cfg_util.cfg_util_qt.layout import BUTTON_KEYS
def disable_buttons(func): def disable_buttons(status: str = ""):
def decorator(func):
# handle the inner function that the decorator is wrapping # handle the inner function that the decorator is wrapping
async def inner(*args, **kwargs): async def inner(*args, **kwargs):
# disable the buttons # disable the buttons
for button in BUTTON_KEYS: for button in BUTTON_KEYS:
window[button].Update(disabled=True) window[button].Update(disabled=True)
window["status"].update(status)
# call the original wrapped function # call the original wrapped function
await func(*args, **kwargs) await func(*args, **kwargs)
@@ -15,5 +17,8 @@ def disable_buttons(func):
# re-enable the buttons after the wrapped function completes # re-enable the buttons after the wrapped function completes
for button in BUTTON_KEYS: for button in BUTTON_KEYS:
window[button].Update(disabled=False) window[button].Update(disabled=False)
window["status"].update("")
return inner return inner
return decorator

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

@@ -48,7 +48,7 @@ def btn_web(table, selected):
webbrowser.open("http://" + window[table].Values[row][0]) webbrowser.open("http://" + window[table].Values[row][0])
@disable_buttons @disable_buttons("Refreshing")
async def btn_refresh(table, selected): async def btn_refresh(table, selected):
ips = [window[table].Values[row][0] for row in selected] ips = [window[table].Values[row][0] for row in selected]
if not len(selected) > 0: if not len(selected) > 0:

4
tools/cfg_util/cfg_util_qt/layout.py
View File

@@ -279,11 +279,11 @@ def get_config_layout():
layout = [ layout = [
[ [
sg.Text("", size=(10, 1), key="status"), sg.Text("", size=(20, 1), key="status"),
sg.ProgressBar( sg.ProgressBar(
max_value=100, size_px=(0, 20), expand_x=True, key="progress_bar" max_value=100, size_px=(0, 20), expand_x=True, key="progress_bar"
), ),
sg.Text("", size=(10, 1), key="progress_percent"), sg.Text("", size=(20, 1), key="progress_percent", justification="r"),
], ],
[ [
sg.TabGroup( sg.TabGroup(

2
tools/cfg_util/cfg_util_qt/scan/__init__.py
View File

@@ -41,7 +41,7 @@ async def btn_scan(scan_ip: str):
asyncio.create_task(_scan_miners(network)) asyncio.create_task(_scan_miners(network))
@disable_buttons @disable_buttons("Scanning")
async def _scan_miners(network: MinerNetwork): async def _scan_miners(network: MinerNetwork):
clear_tables() clear_tables()
scan_generator = network.scan_network_generator() scan_generator = network.scan_network_generator()