Skip to content
Snippets Groups Projects
Commit 54982ae8 authored by jkerdreu's avatar jkerdreu
Browse files

'color' cleanup

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2812 b32b6428-25c9-4566-ad07-03861ab6144f
parent 2ad3096d
No related branches found
No related tags found
No related merge requests found
......@@ -432,11 +432,11 @@ def dumper():
def is_alive():
helper = ToolboxHelper()
helper.parser.add_option("-t",dest="filter_type",help="only show given device type")
(options,_) = helper.parse()
helper.parse()
(eng,dev) = helper.setup_basic()
dev_type = helper.get_filter_devtype()
color = not options.no_color
color = not helper.options.no_color
async def alive_callback(msg):
if (msg.source == dev.address) or (msg.is_alive() == False): return
......@@ -561,12 +561,13 @@ def log():
helper = ToolboxHelper()
helper.parser.add_option("-f",dest="filter_address",help="only show given address")
helper.parser.add_option("-t",dest="filter_type",help="only show given device type")
helper.parse()
(options,_)=helper.parse()
eng = helper.setup_engine()
target = helper.get_filter_address()
dev_type = helper.get_filter_devtype()
color = not helper.options.no_color
def log_callback(msg):
if msg.is_alive() or (msg.action in HIDE_ACTION):
......@@ -584,10 +585,10 @@ def log():
elif msg.is_request(): color=Colors.REQUEST
elif msg.is_reply(): color=Colors.REPLY
if options.no_color == True:
dump = f"{time.ctime()} {msg.source} {msg.dev_type}\t{msg.action} {msg.body}"
else:
if color:
dump = f"{Colors.DEFAULT}{time.ctime()} {Colors.ADDR}{msg.source} {Colors.DEV_TYPE}{msg.dev_type}\t{color}{msg.action} {msg.body}{style.RESET}"
else:
dump = f"{time.ctime()} {msg.source} {msg.dev_type}\t{msg.action} {msg.body}"
print(dump)
eng.subscribe(log_callback)
......@@ -607,7 +608,7 @@ def query_db():
target = tools.get_uuid(args[0])
if target == None:
helper.error("Invalid address: %s" % args[0])
# FIXME:
color = not helper.options.no_color
def query_db_callback(msg):
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment