Skip to content
Snippets Groups Projects
Commit 6b4f7c29 authored by Seblu's avatar Seblu
Browse files

TqlCommand now handle index option

parent 8c63a804
No related branches found
No related tags found
No related merge requests found
...@@ -85,6 +85,9 @@ class TqlCommand(OptionCommand): ...@@ -85,6 +85,9 @@ class TqlCommand(OptionCommand):
# set tql status stuff # set tql status stuff
self.add_option("-q", "--quiet", action="store_false", dest="status", self.add_option("-q", "--quiet", action="store_false", dest="status",
help="Dont status of call request") help="Dont status of call request")
# index printing
self.add_option("-i", "--index", action="store_true", dest="index",
help="Print TQL line index")
# tql printer option # tql printer option
self.add_option("--print-tql", action="store_true", dest="tql_print", self.add_option("--print-tql", action="store_true", dest="tql_print",
help="Print TQL before sending to server") help="Print TQL before sending to server")
...@@ -126,8 +129,9 @@ class TqlCommand(OptionCommand): ...@@ -126,8 +129,9 @@ class TqlCommand(OptionCommand):
_exception: catch or not RPCError exception _exception: catch or not RPCError exception
''' '''
# set default option value # set rpccall default option value
_options = { "status": True, _options = { "status": True,
"index": False,
"direct": False, "direct": False,
"exception": False, "exception": False,
"tql": "", "tql": "",
...@@ -168,7 +172,7 @@ class TqlCommand(OptionCommand): ...@@ -168,7 +172,7 @@ class TqlCommand(OptionCommand):
if _options["callback"] is not None: if _options["callback"] is not None:
_options["callback"](d) _options["callback"](d)
if _options["status"]: if _options["status"]:
self.print_objects(d, ["output"]) self.print_objects(d, ["output"], index=_options["index"])
return d return d
except RpcError as e: except RpcError as e:
if _options["exception"]: if _options["exception"]:
...@@ -186,7 +190,7 @@ class TqlCommand(OptionCommand): ...@@ -186,7 +190,7 @@ class TqlCommand(OptionCommand):
if len(objs["objects"]) == 0: if len(objs["objects"]) == 0:
raise cmdError("No selected object by TQL.") raise cmdError("No selected object by TQL.")
self.printer.out("Objects:") self.printer.out("Objects:")
self.print_objects(objs) self.print_objects(objs, index=_options["index"])
self.printer.out("Objects count: %s"%len(objs["objects"])) self.printer.out("Objects count: %s"%len(objs["objects"]))
# be sure boby want do that # be sure boby want do that
if self.printer.ask("%sProceed?%s (yes): "%(color["lred"], color["reset"])) != "yes": if self.printer.ask("%sProceed?%s (yes): "%(color["lred"], color["reset"])) != "yes":
...@@ -206,16 +210,18 @@ class TqlCommand(OptionCommand): ...@@ -206,16 +210,18 @@ class TqlCommand(OptionCommand):
if _options["callback"] is not None: if _options["callback"] is not None:
_options["callback"](obj) _options["callback"](obj)
if _options["status"]: if _options["status"]:
self.print_objects(d, ["output"]) self.print_objects(d, ["output"], index=False)
except RpcError as e: except RpcError as e:
self.printer.error("RPCError: %s"%str(e)) self.printer.error("RPCError: %s"%str(e))
def print_objects(self, objectlist, ignore=None): def print_objects(self, objectlist, ignore=None, index=False):
'''Trivial objectlist printing of tag''' '''Trivial objectlist printing of tag'''
if objectlist is None: if objectlist is None:
return return
_order = objectlist.get("order", None) _order = objectlist.get("order", None)
for o in objectlist["objects"]: for (i,o) in enumerate(objectlist["objects"]):
if index:
self.printer.out("[%s] "%i, nl="")
self.print_tags(o, order=_order, ignore=ignore) self.print_tags(o, order=_order, ignore=ignore)
def print_tags(self, taglist, order=None, ignore=None): def print_tags(self, taglist, order=None, ignore=None):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment