Better display of stream contents.
Distiguishing traits and events are better displayed in an attempt to restrict wrapping. Change-Id: I6c2755249b727e8b2df5db447c35670a0d4725ce
This commit is contained in:
parent
6f1edf53eb
commit
429e63fa0c
@ -17,6 +17,7 @@
|
|||||||
import base
|
import base
|
||||||
import json
|
import json
|
||||||
import jsonutil
|
import jsonutil
|
||||||
|
import prettytable
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from docopt import docopt
|
from docopt import docopt
|
||||||
@ -79,10 +80,30 @@ class Streams(object):
|
|||||||
|
|
||||||
# TODO(sandy): This should come from the server-issued
|
# TODO(sandy): This should come from the server-issued
|
||||||
# schema at some point.
|
# schema at some point.
|
||||||
|
|
||||||
keys = ['id', 'state', 'name', 'first_event', 'last_event',
|
keys = ['id', 'state', 'name', 'first_event', 'last_event',
|
||||||
'fire_timestamp', 'expire_timestamp',
|
'fire_timestamp', 'expire_timestamp']
|
||||||
'distinguishing_traits', 'events']
|
for row in raw_rows:
|
||||||
base.dump_response(keys, raw_rows)
|
x = prettytable.PrettyTable(["Section", "Property", "Value"])
|
||||||
|
for key in keys:
|
||||||
|
x.add_row(["Stream", key, row.get(key)])
|
||||||
|
|
||||||
|
if 'distinguishing_traits' in row.keys():
|
||||||
|
for key, value in row['distinguishing_traits'].items():
|
||||||
|
x.add_row(["D.Trait", key, value])
|
||||||
|
|
||||||
|
print x
|
||||||
|
|
||||||
|
if 'events' in row.keys():
|
||||||
|
# This has detail rows ... handle those separately.
|
||||||
|
print "Events:"
|
||||||
|
for event in row['events']:
|
||||||
|
x = prettytable.PrettyTable(["Property", "Value"])
|
||||||
|
sorted_keys = sorted(event.keys())
|
||||||
|
for key in sorted_keys:
|
||||||
|
x.add_row([key, event[key]])
|
||||||
|
print x
|
||||||
|
|
||||||
|
|
||||||
def do_streams(self, version, arguments):
|
def do_streams(self, version, arguments):
|
||||||
sid = arguments.get('--id')
|
sid = arguments.get('--id')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user