buildz 0.5.3__tar.gz → 0.5.4__tar.gz

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.3
-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.3 → 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.3 → 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.3 → 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.3 → 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.3 → 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.3 → 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.3 → 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.3 → 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:

{buildz-0.5.3 → 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.3 → 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.3 → 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.3 → buildz-0.5.4/buildz.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.3
-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.3 → buildz-0.5.4}/setup.py

@@ -7,11 +7,11 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.5.3',
+    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',