buildz 0.8.8__tar.gz → 0.8.9__tar.gz

{buildz-0.8.8/buildz.egg-info → buildz-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.8
+Version: 0.8.9
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.8.8 → buildz-0.8.9}/buildz/_dz/conf.py

@@ -11,6 +11,10 @@ def dzkeys(key, spt):
         key = [key]
     return key
 class Conf(Base):
+    def val(self):
+        return self.get_conf()
+    def top(self):
+        return self.root or self
     def get_conf(self):
         if self.domain:
             key = self.domain
@@ -20,7 +24,9 @@ class Conf(Base):
         return obj.conf
     def str(self):
         return str(self.get_conf())
-    def call(self, domain):
+    def call(self, domain=None):
+        if domain is None:
+            return self.top()
         if self.domain:
             domain = self.domain+self.spt+domain
         obj = self.root or self
@@ -33,6 +39,7 @@ class Conf(Base):
         if root is None:
             self.conf = {}
         self.dr_bind('_get', 'get')
+        self.dr_bind('_hget', 'hget')
         self.dr_bind('_set', 'set')
         self.dr_bind('_has', 'has')
     def clean(self):
@@ -65,7 +72,11 @@ class Conf(Base):
     def _set(self, key, val):
         keys = dzkeys(key, self.spt)
         mapz.dset(self.conf, keys, val)
+    def _hget(self, key, default=None):
+        keys = dzkeys(key, self.spt)
+        return mapz.dget(self.conf, keys, default)
     def _get(self, key, default=None):
+        return self._hget(key, default)[0]
         keys = dzkeys(key, self.spt)
         return mapz.dget(self.conf, keys, default)[0]
     def _has(self, key):

{buildz-0.8.8 → buildz-0.8.9}/buildz/argx.py

@@ -1,5 +1,6 @@
 #coding=utf-8
-import sys
+import sys,re
+from .base import Base
 class Fetch:
     """
     命令行参数读取
@@ -60,6 +61,45 @@ class FetchX(Fetch):
         super().__init__(a,b)
 
 pass
+
+def build_pt(pt, fc):
+    st = "^"
+    ed = "$"
+    if pt[0]!=st:
+        pt = st+pt
+    if pt[-1]!=ed:
+        pt = pt+ed
+    def wfc(val):
+        if re.match(pt, val) is None:
+            return None, 0
+        val = fc(val)
+        return val, 1
+    return wfc
+
+pass
+class ValDeals(Base):
+    def init(self):
+        self.deals = []
+    def add(self, fc):
+        self.deals.append(fc)
+    def call(self, val):
+        if type(val)!=str:
+            return val
+        for deal in self.deals:
+            rst, done = deal(val)
+            if done:
+                return rst
+        return val
+
+pass
+to_val = ValDeals()
+to_val.add(build_pt("[\+\-]?\d+", int))
+to_val.add(build_pt("[\+\-]?\d*\.\d+", float))
+to_val.add(build_pt("[\+\-]?\d*(?:\.\d+)?e[\+\-]?\d+", float))
+to_val.add(build_pt("null", lambda x:None))
+to_val.add(build_pt("true", lambda x:True))
+to_val.add(build_pt("false", lambda x:False))
+
 def fetch(argv = None):
     r"""
     format: a b c -a 123 -b456 --c=789 +d  -x"??? ???" y z
@@ -107,6 +147,7 @@ def fetch(argv = None):
         for key in keys:
             if key not in maps:
                 maps[key] = []
+            val = to_val(val)
             maps[key].append(val)
         i+=1
     for k in maps:

{buildz-0.8.8 → buildz-0.8.9}/buildz/confz.py

@@ -1,16 +1,18 @@
 from .dz import Conf
 from . import xf, pathz, pyz, argx
 import sys, os
-def load_conf(conf, dp=None, dp_key = ''):
+def load_conf(conf, dp=None, dp_key = 'dp', src_key = 'src.conf'):
     fps, base = conf.gets('fps, conf', [], {})
     if type(fps)==str:
         fps = [fps]
     conf_first,replace,flush,visit_list = conf.gets('conf_first,replace,flush,visit_list',1, 1,1,0)
     spt, spts = conf.gets('spt, spts','.',',')
-    dp = conf.get('dp', dp)
+    dp = conf.get(dp_key, dp)
     path = pathz.Path()
     path.set("dp", dp)
     rst = Conf(spt, spts)
+    if src_key is not None:
+        rst.set(src_key, conf)
     if conf_first:
         rst.update(base, flush, replace, visit_list)
     for fp in fps:
@@ -20,11 +22,6 @@ def load_conf(conf, dp=None, dp_key = ''):
         rst.update(base, flush, replace, visit_list)
     return rst
 # using
-def simple(conf):
-    fc = conf.get('fc')
-    assert fc is not None
-    fc = pyz.load(fc)
-    return fc(conf)
 def calls(conf):
     calls = conf.get("calls", [])
     if type(calls)==str:
@@ -32,6 +29,14 @@ def calls(conf):
     for key in calls:
         assert conf.has(key)
         simple(conf(key))
+def simple(conf):
+    fc = conf.get('fc')
+    if fc is None:
+        fc = calls
+    else:
+        #assert fc is not None
+        fc = pyz.load(fc)
+    return fc(conf)
 def get_sys_conf(conf = []):
     if type(conf) == str:
         conf = xf.loadf(conf)
@@ -52,7 +57,7 @@ def run(dp = None, fp = None, init_conf = {}):
     conf = Conf().update(conf)
     init = conf.get(conf.get("key.init", "init"), {})
     conf = load_conf(conf, dp).update(init)
-    calls(conf)
+    simple(conf)
 def test():
     run()
 pyz.lc(locals(), test)

{buildz-0.8.8 → buildz-0.8.9/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.8
+Version: 0.8.9
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.8.8 → buildz-0.8.9}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.8.8',
+    version = '0.8.9',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',