lbkit 0.8.2__tar.gz → 0.8.4__tar.gz

{lbkit-0.8.2/lbkit.egg-info → lbkit-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lbkit
-Version: 0.8.2
+Version: 0.8.4
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.8.4/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.8.4'

{lbkit-0.8.2 → lbkit-0.8.4}/lbkit/codegen/codegen.py

@@ -65,7 +65,8 @@ class Version():
 # TODO： 支持生成代码稳定性测试，确保生成的代码一致性
 history_versions = {
     "5.0": CodeGenHistory("lb_base/[>=0.8.1 <0.9.0]", "简化接口类名定义;简化枚举变量在接口间传递时的字符串定义", "0"),
-    "5.1": CodeGenHistory("lb_base/[>=0.8.3 <0.9.0]", "方法和信号添加保留字段用于功能扩展，同时设置请求和响应为空标志位", "8002")
+    "5.1": CodeGenHistory("lb_base/[>=0.8.3 <0.9.0]", "方法和信号添加保留字段用于功能扩展，同时设置请求和响应为空标志位", "8002"),
+    "5.2": CodeGenHistory("lb_base/[>=0.8.4 <0.9.0]", "支持校验数值边界、字符串正则以及数组匹配等规则", "8004"),
 }
 __version__=Version("5.1")
 
@@ -104,6 +105,7 @@ class CodeGen(object):
     def __init__(self, args):
         self.args = args
         self.codegen_version = __version__
+        self.log_level = "NOTSET"
 
     def _gen(self, idf_file, directory=".", code_type="all"):
         directory = os.path.realpath(directory)
@@ -137,7 +139,7 @@ class CodeGen(object):
 
     def get_interface(self, idf_file):
         lookup = TemplateLookup(directories=os.path.join(lb_cwd, "template"))
-        return IdfInterface(lookup, idf_file, self.codegen_version)
+        return IdfInterface(lookup, idf_file, self.codegen_version, self.log_level)
 
     def run(self):
         """
@@ -150,6 +152,11 @@ class CodeGen(object):
                                          formatter_class=SmartFormatter)
         codegen_version_arg(parser)
         parser.add_argument("-d", "--directory", help='generate code directory', default=".")
+        parser.add_argument("-l", "--log_level", help='show log level',
+                            choices=[
+                                "CRITICAL", "FATAL", "ERROR", "WARN",
+                                "WARNING", "INFO", "DEBUG", "NOTSET",
+                            ], default=None)
         parser.add_argument("-t", "--codetype", help='code type, default: all', default="all", choices=["public", "server", "client", "all"])
         group2 = parser.add_argument_group('cdf file', 'Generate code using the specified CDF file')
         group2.add_argument("-c", "--cdf_file", help='component description file, default metadata/package.yml', default=None)
@@ -157,6 +164,9 @@ class CodeGen(object):
         group1.add_argument("-i", "--idf_file", help='A IDF file to be processed e.g.: com.litebmc.Upgrade.xml', default=None)
 
         args = parser.parse_args(self.args)
+        if args.log_level:
+            self.log_level = args.log_level
+            log.setLevel(self.log_level)
 
         if args.cdf_file:
             if not os.path.isfile(args.cdf_file):