refactored common logic for printing the outcome; incl. case where nothing needs to be done
This commit is contained in:
16
commands.py
16
commands.py
@ -7,7 +7,7 @@ from utils.df import drop_col, compare_dfs, count_true
|
||||
from utils.epics import DataGetter, DataPutter
|
||||
from utils.execute import parallel, serial
|
||||
from utils.fileio import load_config, load_csv, store_csv
|
||||
from utils.printing import print_good, print_bad, itemize
|
||||
from utils.printing import print_good, print_bad, print_outcome, itemize
|
||||
from utils.seq import is_empty
|
||||
|
||||
|
||||
@ -35,12 +35,7 @@ def run_check(clargs):
|
||||
# print(df.dtypes)
|
||||
|
||||
connected = df["connected"]
|
||||
if connected.all():
|
||||
print_good("all connections OK")
|
||||
else:
|
||||
ntotal = len(connected)
|
||||
ngood = count_true(connected)
|
||||
print_bad(f"only {ngood}/{ntotal} connections OK")
|
||||
print_outcome(connected, "connections OK")
|
||||
|
||||
output = clargs.output
|
||||
if not output:
|
||||
@ -104,12 +99,7 @@ def run_goto(clargs):
|
||||
status = run(put_data, pvs, values)
|
||||
|
||||
status = np.array(status)
|
||||
if status.all():
|
||||
print_good("all puts successful")
|
||||
else:
|
||||
ntotal = len(status)
|
||||
ngood = count_true(status)
|
||||
print_bad(f"only {ngood}/{ntotal} puts successful")
|
||||
print_outcome(status, "puts successful")
|
||||
|
||||
|
||||
|
||||
|
@ -11,6 +11,7 @@ MSG_SUCCESS = "OK"
|
||||
|
||||
SYM_GOOD = "👍"
|
||||
SYM_BAD = "💔"
|
||||
SYM_NOTHING = "😱"
|
||||
|
||||
|
||||
|
||||
|
@ -1,6 +1,20 @@
|
||||
from .consts import SYM_GOOD, SYM_BAD
|
||||
from .consts import SYM_NOTHING, SYM_GOOD, SYM_BAD
|
||||
from .seq import is_empty
|
||||
|
||||
|
||||
def print_outcome(state, units):
|
||||
if is_empty(state):
|
||||
print_nothing("nothing to do")
|
||||
elif all(state):
|
||||
print_good(f"all {units}")
|
||||
else:
|
||||
ntotal = len(state)
|
||||
ngood = count_true(state)
|
||||
print_bad(f"only {ngood}/{ntotal} {units}")
|
||||
|
||||
def print_nothing(*args, **kwargs):
|
||||
return print(SYM_NOTHING, *args, **kwargs)
|
||||
|
||||
def print_good(*args, **kwargs):
|
||||
return print(SYM_GOOD, *args, **kwargs)
|
||||
|
||||
|
Reference in New Issue
Block a user