buildz 0.9.6__tar.gz → 0.9.8__tar.gz

{buildz-0.9.6/buildz.egg-info → buildz-0.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.9.6
+Version: 0.9.8
 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.9.6 → buildz-0.9.8}/buildz/_dz/conf.py

@@ -52,11 +52,12 @@ class Conf(Base):
                 val,find = obj.hget(domain,link=link)
                 loop-=1
         return Conf(self.spt, self.spts, domain, obj)
-    def init(self, spt='.', spts=',', domain=None, root = None):
+    def init(self, spt='.', spts=',', domain=None, root = None, src = None):
         self.spt = spt
         self.spts = spts
         self.domain = domain
         self.root = root
+        self.src = src
         if root is None:
             self.conf = {}
             self.history = {}
@@ -200,6 +201,7 @@ class Conf(Base):
             obj = obj[0][key]
             fc(obj, deep, len(keys))
     def _link(self, src, target):
+        #print(f"[LINK] {src}->{target}")
         links = self.ld_get(self._links, src, lambda :[{}, None, 0])
         links[1] = target
         links[2] =1
@@ -231,6 +233,12 @@ class Conf(Base):
                 bak = a,b
             loop-=1
         return bak
+    def key(self, ks):
+        return self.spt.join(ks)
+    def src_hget(self, key, default, link=-1):
+        if self.src is None:
+            return default, 0
+        return self.src.hget(key, default, loop, link)
     def _lget(self, key, default=None, loop=-1, link=-1):
         return self._lhget(key, default, loop, link)[0]
     def _hget(self, key, default=None, link=-1):
@@ -238,10 +246,13 @@ class Conf(Base):
         keys = dzkeys(key, self.spt)
         val, find = mapz.dget(self.conf, keys, default)
         if find or link==0:
+            if not find:
+                val, find = self.src_hget(key, default, link)
             return val, find
         lnk, has_lnk, deep = self.link_match(keys)
         if not has_lnk:
-            return val, find
+            return self.src_hget(key, default, link)
+            #return val, find
         keys = keys[deep:]
         key = self.spt.join(keys)
         if lnk is not None:

{buildz-0.9.6 → buildz-0.9.8}/buildz/confz.py

@@ -85,12 +85,25 @@ def conf_update(conf):
         conf = conf.ltop(conf.domain)
     up = conf.get('up', link=0)
     return conf
+def deep_link(conf):
+    up = conf.get('up', link=0)
+    if not up:
+        return
+    deep_link(conf.top(up))
+    conf().link(conf.domain, up)
+    #conf.remove('up')
+def deep_copy(conf):
+    src = conf.get('copy', link=0)
+    if not src:
+        return
+    deep_copy(conf.top(src))
+    conf.update(conf.top(src).val(),replace=0)
+    #conf.remove('copy')
 def simple(conf):
     if conf.get_type()==str:
         conf = conf.ltop(conf.domain)
-    up = conf.get('up', link=0)
-    if up:
-        conf().link(conf.domain, up)
+    deep_link(conf)
+    deep_copy(conf)
     fc = get_fc(conf)
     assert fc is not None, f"conf has not setted deal fc: {conf}"
     return fc(conf)
@@ -134,6 +147,24 @@ def switch_fc(conf):
     deal_conf = conf("vals")(val)
     deal = get_fc(conf, "deal_fc", "deal", "mset")
     return deal(deal_conf)
+def sub_conf(conf):
+    deal = get_fc(conf, "deal_fc", "deal", "mset")
+    val = conf("val")
+    return deal(val)
+def msets(conf, keys = []):
+    # if not conf.has_val():
+    #     return conf
+    for k,v in conf.val().items():
+        ks = keys+[k]
+        if type(v)==str:
+            val = conf.top(v).val()
+            conf().set(conf.key(ks), val)
+            #conf().top(conf.key(ks)).update(val)
+            pass
+        else:
+            msets(conf(k), ks)
+            #conf().top(k).update(v)
+    return conf
 def init_fn(conf):
     maps = {
         "calls": calls,
@@ -143,7 +174,9 @@ def init_fn(conf):
         "has_set": lambda conf:conf.top().has(conf.get("key")),
         "equal": lambda conf:conf.top().get(conf.get("key"))==conf.get("val"),
         "get": lambda conf: conf.top().get(conf.get("key")),
-        "mset": lambda conf:conf.top().update(conf.val()) if conf.has_val() else conf
+        "mset": lambda conf:conf.top().update(conf.val()) if conf.has_val() else conf,
+        "deal_val":sub_conf,
+        "msets": msets
     }
     conf(fn_cache_key).update(maps, replace=False)
 def run(dp = None, fp = None, init_conf = {}):

{buildz-0.9.6 → buildz-0.9.8}/buildz/xf/loaderz/deal/spt.py

@@ -7,6 +7,10 @@ class PrevSptDeal(base.BaseDeal):
     def types(self):
         return [self.type]
     def build(self, obj):
+        if self.ret is not None:
+            obj.val = self.ret
+            obj.is_val = 1
+            return obj
         return item.null
     def prepare(self, mgs):
         self.spt = mgs.like(self.spt)
@@ -31,10 +35,11 @@ class PrevSptDeal(base.BaseDeal):
     """
         分隔符，有分隔符后将缓存的数据当作字符串
     """
-    def init(self, spt, allow_empty = False, type = "spt"):
+    def init(self, spt, allow_empty = False, type = "spt", ret=None):
         self.spt = spt
         self.allow_empty = allow_empty
         self.l = len(spt)
         self.type = type
+        self.ret = ret
 
 pass

{buildz-0.9.6 → buildz-0.9.8/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.9.6
+Version: 0.9.8
 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.9.6 → buildz-0.9.8}/setup.py

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