changeset 1545:b8ee774c12c8

jp: renamed “params” command to “param” for consistency with other commands + added a “get” subcommand
author Goffi <goffi@goffi.org>
date Mon, 02 Nov 2015 22:02:41 +0100 (2015-11-02)
parents 3d5193b4c582
children 62d6310e7c04
files frontends/src/jp/cmd_param.py frontends/src/jp/cmd_params.py
diffstat 2 files changed, 83 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/frontends/src/jp/cmd_param.py	Mon Nov 02 22:02:41 2015 +0100
@@ -0,0 +1,83 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+
+# jp: a SAT command line tool
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Jérôme Poisson (goffi@goffi.org)
+# Copyright (C) 2013, 2014, 2015 Adrien Cossa (souliane@mailoo.org)
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import base
+from sat.core.i18n import _
+__commands__ = ["Param"]
+
+
+class Get(base.CommandBase):
+    def __init__(self, host):
+        super(Get, self).__init__(host, 'get', help=_('Get a parameter value'))
+
+    def add_parser_options(self):
+        self.parser.add_argument("category", type=base.unicode_decoder, help=_(u"Category of the parameter"))
+        self.parser.add_argument("name", type=base.unicode_decoder, help=_(u"Name of the parameter"))
+        self.parser.add_argument("-a", "--attribute", type=str, default="value", help=_(u"Name of the attribute to get"))
+        self.parser.add_argument("--security-limit", type=int, default=-1, help=_(u"Security limit"))
+
+    def connected(self):
+        super(Get, self).connected()
+        try:
+            value = self.host.bridge.asyncGetParamA(self.args.name, self.args.category, self.args.attribute,
+                                                              self.args.security_limit, self.profile)
+        except Exception:
+            print u"Can't find requested parameter"
+            self.host.quit(1)
+        print value
+
+
+class SaveTemplate(base.CommandBase):
+    def __init__(self, host):
+        super(SaveTemplate, self).__init__(host, 'save', use_profile=False, help=_('Save parameters template to xml file'))
+
+    def add_parser_options(self):
+        self.parser.add_argument("filename", type=str, help=_("Output file"))
+
+    def run(self):
+        """Save parameters template to xml file"""
+        if self.host.bridge.saveParamsTemplate(self.args.filename):
+            print _("Parameters saved to file %s") % self.args.filename
+        else:
+            print _("Can't save parameters to file %s") % self.args.filename
+
+
+class LoadTemplate(base.CommandBase):
+
+    def __init__(self, host):
+        super(LoadTemplate, self).__init__(host, 'load', use_profile=False, help=_('Load parameters template from xml file'))
+
+    def add_parser_options(self):
+        self.parser.add_argument("filename", type=str, help=_("Input file"))
+
+    def run(self):
+        """Load parameters template from xml file"""
+        if self.host.bridge.loadParamsTemplate(self.args.filename):
+            print _("Parameters loaded from file %s") % self.args.filename
+        else:
+            print _("Can't load parameters from file %s") % self.args.filename
+
+
+class Param(base.CommandBase):
+    subcommands = (Get, SaveTemplate, LoadTemplate)
+
+    def __init__(self, host):
+        super(Param, self).__init__(host, 'param', use_profile=False, help=_('Save/load parameters template'))
--- a/frontends/src/jp/cmd_params.py	Mon Nov 02 22:02:41 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-# jp: a SAT command line tool
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Jérôme Poisson (goffi@goffi.org)
-# Copyright (C) 2013, 2014, 2015 Adrien Cossa (souliane@mailoo.org)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import base
-from sat.core.i18n import _
-
-__commands__ = ["Params"]
-
-
-class SaveTemplate(base.CommandBase):
-    def __init__(self, host):
-        super(SaveTemplate, self).__init__(host, 'save', use_profile=False, help=_('Save parameters template to xml file'))
-
-    def add_parser_options(self):
-        self.parser.add_argument("filename", type=str, help=_("Output file"))
-
-    def run(self):
-        """Save parameters template to xml file"""
-        if self.host.bridge.saveParamsTemplate(self.args.filename):
-            print _("Parameters saved to file %s") % self.args.filename
-        else:
-            print _("Can't save parameters to file %s") % self.args.filename
-
-
-class LoadTemplate(base.CommandBase):
-
-    def __init__(self, host):
-        super(LoadTemplate, self).__init__(host, 'load', use_profile=False, help=_('Load parameters template from xml file'))
-
-    def add_parser_options(self):
-        self.parser.add_argument("filename", type=str, help=_("Input file"))
-
-    def run(self):
-        """Load parameters template from xml file"""
-        if self.host.bridge.loadParamsTemplate(self.args.filename):
-            print _("Parameters loaded from file %s") % self.args.filename
-        else:
-            print _("Can't load parameters from file %s") % self.args.filename
-
-
-class Params(base.CommandBase):
-    subcommands = (SaveTemplate, LoadTemplate)
-
-    def __init__(self, host):
-        super(Params, self).__init__(host, 'params', use_profile=False, help=_('Save/load parameters template'))