buildz 0.5.2__tar.gz → 0.5.4__tar.gz

{buildz-0.5.2/buildz.egg-info → buildz-0.5.4}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.2
-Summary: 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
+Version: 0.5.4
+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)
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz
 Author-email: 1309458652@qq.com
@@ -28,6 +28,8 @@ License-File: LICENSE
 
 运行python -m buildz查看帮助
 
+持续更新中。。。
+
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf
@@ -45,5 +47,7 @@ code relationship:
 
 run python -m buildz to see help
 
+continue updating...
+
 PS: testing speed on json.loads(has modified scanner.py in json module to make it purely run on Python, which make it run slower) and xf.loads(real func is buildz.xf.readz.loads), xf.loads takes 7 times longer than json.loads, it may cost by more func calls and more string cutting and reading(to make codes more structuring and easier to update)
 ```

{buildz-0.5.2 → buildz-0.5.4}/README.md

@@ -15,6 +15,8 @@
 
 运行python -m buildz查看帮助
 
+持续更新中。。。
+
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf
@@ -32,5 +34,7 @@ code relationship:
 
 run python -m buildz to see help
 
+continue updating...
+
 PS: testing speed on json.loads(has modified scanner.py in json module to make it purely run on Python, which make it run slower) and xf.loads(real func is buildz.xf.readz.loads), xf.loads takes 7 times longer than json.loads, it may cost by more func calls and more string cutting and reading(to make codes more structuring and easier to update)
 ```

{buildz-0.5.2 → buildz-0.5.4}/buildz/demo/myers/deal.py

@@ -41,7 +41,7 @@ class Deal:
                         stp[-1] = c.decode()
                 stps = "t"+xf.dumps(stps)
                 stps = stps.encode()
-            fz.write(fp_step, stps)
+            fz.write(stps, fp_step)
             print("done diff")
         elif opt == 'update':
             bs1 = fz.read(fp1).decode("utf-8")
@@ -53,7 +53,7 @@ class Deal:
             else:
                 stps = xf.loads(bs_step.decode())
             bs2 = tz.m_update(bs1, stps,split=spt).encode("utf-8")
-            fz.write(fp2, bs2)
+            fz.write(bs2, fp2)
             print("done update")
         else:
             print(f"unexpect opt: {opt}")

{buildz-0.5.2 → buildz-0.5.4}/buildz/fz/fio.py

@@ -20,13 +20,13 @@ def freads(fp, mode = 'rb', size=1024*1024):
 pass
 reads=freads
 
-def fwrite(fp, ct, mode = 'wb'):
+def fwrite(ct, fp, mode = 'wb'):
     with open(fp, mode) as f:
         f.write(ct)
 
 pass
 write = fwrite
-def fwrites(fp, cts, mode = 'wb'):
+def fwrites(cts, fp, mode = 'wb'):
     with open(fp, mode) as f:
         for ct in cts:
             f.write(ct)

{buildz-0.5.2 → buildz-0.5.4}/buildz/ioc/ioc_deal/conf/env_lists.js

@@ -14,5 +14,10 @@
     {
         nullable: 0,
         key: key
+    },
+    {
+        nullable: 1,
+        key: default
+        default: null
     }
 ]

{buildz-0.5.2 → buildz-0.5.4}/buildz/ioc/ioc_deal/env.py

@@ -12,6 +12,7 @@ class EnvDeal(FormatDeal):
                 id: id
                 type: env
                 key: 环境变量key
+                default: item_conf //可选
             }
         简写：
             [[id, env], key]
@@ -25,6 +26,10 @@ class EnvDeal(FormatDeal):
         data = edata.data
         data = self.fill(data)
         key = data['key']
-        return edata.conf.get_env(key)
+        val = edata.conf.get_env(key)
+        default = xf.g(data, default=None)
+        if val is None and default is not None:
+            val = self.get_obj(default, edata.conf)
+        return val
 
 pass

{buildz-0.5.2 → buildz-0.5.4}/buildz/ioc/ioc_deal/xfile.py

@@ -11,8 +11,8 @@ class XfileDeal(FormatDeal):
         {
             id:id
             type:xfile
-            filepath: fp 
-            # or fp: fp
+            filepath: item_conf(fp) 
+            # or fp: item_conf(fp)
         }
     简写:
         [[id, xfile], fp]
@@ -20,6 +20,7 @@ class XfileDeal(FormatDeal):
         [xf, fp]
     例:
         [xfile, test.js]
+        [xfile, [val, test.js]]
     """
     def init(self, fp_lists = None, fp_defaults = None):
         self.singles = {}
@@ -35,6 +36,7 @@ class XfileDeal(FormatDeal):
         fp = xf.g(data, filepath=None)
         if fp is None:
             fp = xf.g(data, fp = fp)
+        fp = self.get_obj(fp, conf)
         rst = xf.loads(xf.fread(fp))
         return rst
 

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/file.py

@@ -40,7 +40,7 @@ def fread_c(filepath, coding = 'utf-8'):
 
 pass
 
-def fwrite(filepath, content, mode = 'w'):
+def fwrite(content, filepath, mode = 'w'):
     with open(filepath, mode) as f:
         f.write(content)
 

buildz-0.5.4/buildz/xf/loaderz/deal/listz.py

@@ -0,0 +1,35 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class ListDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        super().init(left, right, 'list')
+    def types(self):
+        return ['']
+    def build(self, obj):
+        val = obj.val
+        if type(val)!=list:
+            obj.is_val = 1
+            return obj
+        if len(val)==0:
+            obj.val = ''
+            obj.is_val = 1
+            return obj
+        if len(val)>1:
+            opt = val[1]
+            if opt.type=='kv':
+                return None
+        return self.build_arr(val)
+    def build_arr(self, arr):
+        rst = []
+        for _item in arr:
+            if not _item.is_val:
+                raise Exception(f"error in list:{_item}")
+            rst.append(_item.val)
+        return item.Item(rst, type='list', is_val = 1)
+
+pass

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/deal/lr.py

@@ -14,7 +14,7 @@ class LRDeal(base.BaseDeal):
         rm = buffer.full().strip()
         buffer.clean2read(self.ll)
         if len(rm)>0:
-            arr.append(item.Item(rm, type="", is_val=False))
+            _arr.append(item.Item(rm, type="", is_val=False))
         while True:
             cr = buffer.read(self.lr)
             if cr == self.right:
@@ -26,17 +26,26 @@ class LRDeal(base.BaseDeal):
         buffer.clean()
         if len(rm)>0:
             _arr.append(item.Item(rm ,type = '', is_val=False))
+        # dts = []
+        # for k in _arr:
+        #     _k = mg.build(k)
+        #     if item.is_null(_k):
+        #         continue
+        #     dts.append(_k)
+        #dts = [mg.build(k) for k in _arr]
+        dts = mg.build_arr(_arr)
+        obj = self.build_arr(dts)
+        rst.append(obj)
+        return True
+    def to_vals(self, _arr, mg):
         dts = []
         for k in _arr:
             _k = mg.build(k)
             if item.is_null(_k):
                 continue
             dts.append(_k)
-        #dts = [mg.build(k) for k in _arr]
-        obj = self.build(dts)
-        rst.append(obj)
-        return True
-    def build(self, obj):
+        return dts
+    def build_arr(self, obj):
         return item.Item(obj, type = self.type, is_val=True)
     """
         分隔符，有分隔符后将缓存的数据当作字符串

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/deal/mapz.py

@@ -8,7 +8,24 @@ class MapDeal(lr.LRDeal):
     """
     def init(self, left, right):
         super().init(left, right, "map")
-    def build(self, arr):
+    def types(self):
+        return ['']
+    def build(self, obj):
+        val = obj.val
+        if type(val)!=list:
+            obj.is_val = 1
+            return obj
+        if len(val)==0:
+            obj.val = ''
+            obj.is_val = 1
+            return obj
+        if len(val)%3!=0:
+            return None
+        opt = val[1]
+        if opt.type!='kv':
+            return None
+        return self.build_arr(val)
+    def build_arr(self, arr):
         rst = {}
         if len(arr)%3!=0:
             raise Exception(f"u f in map: {arr}")

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/deal/nextz.py

@@ -1,21 +1,29 @@
 from .. import base
-
+from .. import item
 
 class PrevNextDeal(base.BaseDeal):
     def labels(self):
         return ['']
     def types(self):
         return [""]
-    def build(self, obj):
-        obj.is_val = 1
-        return obj
     """
         读取下一个字符放缓存里，应放最低优先级
     """
     def deal(self, buffer, arr, mg):
         c = buffer.read_cache(1)
         if len(c)==0:
+            rm = buffer.full().strip()
+            buffer.clean()
+            if len(rm)==0:
+                return False
+            obj = item.Item(rm, type = '', is_val = 0)
+            arr.append(obj)
             return False
         return True
+    def build(self, obj):
+        if type(obj.val)==list:
+            return None
+        obj.is_val = 1
+        return obj
 
 pass

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/deal/reval.py

@@ -6,6 +6,7 @@ import re
 class ValDeal(base.BaseDeal):
     def prepare(self,mg):
         self.pt = mg.like(self.pt)
+        self.type = mg.type
     def types(self):
         return [""]
     """
@@ -22,6 +23,8 @@ class ValDeal(base.BaseDeal):
         self.fc = fc
     def build(self, obj):
         val = obj.val
+        if type(val) != self.type:
+            return None
         if re.match(self.pt, val) is None:
             return None
         val = self.fc(val)

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/deal/strz.py

@@ -71,6 +71,8 @@ class PrevStrDeal(lr.LRDeal):
             if do_judge and c == self.label_et:
                 mark_et += 1
             if len(c)==0:
+                if self.single_line and self.note:
+                    break
                 raise Exception(f"unexcept string end while reading str")
             do_judge = 1
             if c == self.label_l2:

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/mg.py

@@ -3,6 +3,7 @@ from . import buffer
 from . import base
 from . import pos
 from . import exp
+from . import item
 from ..stack import Stack
 class Manager:
     def __init__(self, as_bytes = False):
@@ -65,7 +66,7 @@ class Manager:
         raise Exception("unspt deal type:"+_type)
     def deal(self, buffer, arr):
         c = buffer.read()
-        if len(c)==0:
+        if len(c)==0 and buffer.size()==0:
             return False
         deals = self.get_deals(c)
         find = False
@@ -77,21 +78,35 @@ class Manager:
             if deal.deal(buffer, arr, self):
                 return True
         return False
+    def build_arr(self, _arr):
+        dts = []
+        for k in _arr:
+            _k = self.build(k)
+            if item.is_null(_k):
+                continue
+            dts.append(_k)
+        return dts
     def load(self, buffer):
         arr = []
         while self.deal(buffer, arr):
             pass
-        arr = [k.val for k in arr]
-        rst = []
-        for k in arr:
-            if type(k) == self.type:
-                if len(k.strip())==0:
-                    continue
-            rst.append(k)
-        arr = rst
-        if len(arr)==1:
-            arr = arr[0]
-        return arr
+        #arr = [k.val for k in arr]
+        #rst = []
+        # for k in arr:
+        #     if type(k) == self.type:
+        #         if len(k.strip())==0:
+        #             continue
+        #     rst.append(k)
+        arr = self.build_arr(arr)
+        obj = item.Item(arr, type = "", is_val = 0)
+        obj = self.build(obj)
+        #arr = rst
+        #if len(arr)==1:
+        #    arr = arr[0]
+        val = obj.val
+        if type(val)==list and len(val)==1:
+            val = val[0]
+        return val
     def loads(self, reader):
         if type(reader) == self.type:
             #print(f"try str, {len(reader)}")

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/loaderz/test.py

@@ -55,7 +55,7 @@ print("test E")
 json.dumps(_map)
 print("test F")
 js = json.dumps(rst)
-js = "\n\n"+js+"\n"
+#js = "\n\n"+js+"\n"
 #js = xf.dumps(rst, json_format=1)
 # js = r"""
 # [
@@ -66,7 +66,7 @@ print("start")
 jv = cost("json.loads", json.loads,js)
 xv = cost("rz.loads",rz.loads,js)
 print(f"judge: {jv==xv}")
-_xv = cost("rd.loads",rd.loads, js)
+#_xv = cost("rd.loads",rd.loads, js)
 #with open("test.json", 'w') as f:
 #    f.write(js)
 if n>3 or m>3 or l > 3:

buildz-0.5.4/buildz/xf/loaderz/test1.py

@@ -0,0 +1,7 @@
+
+
+from buildz import xf
+a = xf.loads("1,2,3")
+b = xf.loads("{a=0,b=1}")
+print(a)
+print(b)

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/mapz.py

@@ -4,6 +4,38 @@ def get(obj, key, default=None):
         return default
     return obj[key]
 
+pass
+def getf(obj, key, fc):
+    if key not in obj:
+        return fc()
+    return obj[key]
+
+pass
+def gfn(obj, **maps):
+    rst = []
+    for k in maps:
+        if k in obj and obj[k] is not None:
+            v = obj[k]
+        else:
+            v = maps[k]()
+        rst.append(v)
+    if len(rst)==1:
+        rst = rst[0]
+    return rst
+
+pass
+def gf(obj, **maps):
+    rst = []
+    for k in maps:
+        if k in obj:
+            v = obj[k]
+        else:
+            v = maps[k]()
+        rst.append(v)
+    if len(rst)==1:
+        rst = rst[0]
+    return rst
+
 pass
 def g(obj, **maps):
     rst = []

{buildz-0.5.2 → buildz-0.5.4}/buildz/xf/write.py

@@ -38,9 +38,9 @@ def dumps(obj, bytes = 0, format = 0, deep = 0, json_format= 0):
 
 pass
 
-def dumpf(filepath, obj, bytes = 0, format = 0, deep = 0, json_format= 0, mode = 'w'):
+def dumpf(obj, filepath, bytes = 0, format = 0, deep = 0, json_format= 0, mode = 'w'):
     s = dumps(obj, bytes = bytes, format = format, deep = deep, json_format= json_format)
-    file.fwrite(filepath, s, mode)
+    file.fwrite(s, filepath, mode)
 
 pass
 

{buildz-0.5.2 → buildz-0.5.4/buildz.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.2
-Summary: 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
+Version: 0.5.4
+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)
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz
 Author-email: 1309458652@qq.com
@@ -28,6 +28,8 @@ License-File: LICENSE
 
 运行python -m buildz查看帮助
 
+持续更新中。。。
+
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf
@@ -45,5 +47,7 @@ code relationship:
 
 run python -m buildz to see help
 
+continue updating...
+
 PS: testing speed on json.loads(has modified scanner.py in json module to make it purely run on Python, which make it run slower) and xf.loads(real func is buildz.xf.readz.loads), xf.loads takes 7 times longer than json.loads, it may cost by more func calls and more string cutting and reading(to make codes more structuring and easier to update)
 ```

{buildz-0.5.2 → buildz-0.5.4}/buildz.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ buildz/xf/loaderz/item.py
 buildz/xf/loaderz/mg.py
 buildz/xf/loaderz/pos.py
 buildz/xf/loaderz/test.py
+buildz/xf/loaderz/test1.py
 buildz/xf/loaderz/deal/listz.py
 buildz/xf/loaderz/deal/lr.py
 buildz/xf/loaderz/deal/lrval.py

{buildz-0.5.2 → buildz-0.5.4}/setup.py

@@ -7,11 +7,11 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.5.2',
+    version = '0.5.4',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',
-    description = "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",
+    description = "配置读写（基于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)",
     license = 'Apache License 2.0',
     url = 'https://github.com/buildCodeZ/buildz',
     author = 'Zzz',

buildz-0.5.2/buildz/xf/loaderz/deal/listz.py

@@ -1,19 +0,0 @@
-from .. import base
-from .. import item
-from .. import exp
-from . import lr
-class ListDeal(lr.LRDeal):
-    """
-        分隔符，有分隔符后将缓存的数据当作字符串
-    """
-    def init(self, left, right):
-        super().init(left, right, 'list')
-    def build(self, arr):
-        rst = []
-        for _item in arr:
-            if not _item.is_val:
-                raise Exception("error in list:"+_item)
-            rst.append(_item.val)
-        return item.Item(rst, type='list', is_val = 1)
-
-pass