buildz 0.5.3__tar.gz → 0.5.5__tar.gz

{buildz-0.5.3/buildz.egg-info → buildz-0.5.5}/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.5
+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.5}/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.5}/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.5}/buildz/fz/__init__.py

@@ -2,6 +2,6 @@
 #author:
 from .dirz import dirs, FileDeal
 from .lsf import lists, search
-from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.5.3 → buildz-0.5.5}/buildz/fz/fio.py

@@ -1,5 +1,5 @@
 #coding=utf-8
-
+import os
 """
 读写文件再简化
 """
@@ -20,16 +20,26 @@ 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)
 
 pass
-writes = fwrites
+writes = fwrites
+
+def makefdir(fp):
+    fp = os.path.abspath(fp)
+    dp = os.path.dirname(fp)
+    if os.path.isdir(dp):
+        return
+    os.makedirs(dp)
+
+pass
+

{buildz-0.5.3 → buildz-0.5.5}/buildz/ioc/ioc_deal/conf/deals.js

@@ -77,6 +77,11 @@
             type: deal,
             note: 扩展的自定义deal方法,
             build: buildz.ioc.ioc_deal.deal.DealDeal
+        },
+        {
+            type: iocf,
+            note: 加配置文件,
+            build: buildz.ioc.ioc_deal.iocf.IOCFObjectDeal
         }
     ]
 }

{buildz-0.5.3 → buildz-0.5.5}/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/ioc/ioc_deal/conf/ref_lists.js → buildz-0.5.5/buildz/ioc/ioc_deal/conf/iocf_lists.js

@@ -16,11 +16,7 @@
         },
         {
             nullable: 0,
-            key: key
-        },
-        {
-            nullable: 1,
-            key: info
+            key: filepath
         }
     ]
 }

buildz-0.5.5/buildz/ioc/ioc_deal/conf/ref_lists.js

@@ -0,0 +1,31 @@
+// [[id, type], key]
+// [type, key]
+{
+    sort: 1
+    data: [
+        {
+            nullable: 0,
+            out: 1,
+            conf: {
+                sort: -1,
+                data:[
+                    {key: id, default: null},
+                    {key: type, default: null}
+                ]
+            }
+        },
+        {
+            nullable: 0,
+            key: key
+        },
+        {
+            nullable: 1,
+            key: info
+            conf: {
+                data: [
+                    {key: lid, default: null}
+                ]
+            }
+        }
+    ]
+}

{buildz-0.5.3 → buildz-0.5.5}/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.5/buildz/ioc/ioc_deal/iocf.py

@@ -0,0 +1,59 @@
+#coding=utf-8
+from ..ioc.base import Base, EncapeData
+from .base import FormatData,FormatDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+class IOCFObjectDeal(FormatDeal):
+    """
+        iocf字段ioc:
+            {
+                id:id
+                type: iocf
+
+                filepath: item_conf
+                // or
+                folder: item_conf
+                pattern: item_conf
+            }
+        简写:
+            [[id, ioc], filepath]
+        例:
+            [iocf, filepath] //
+    """
+    def init(self, fp_lists=None, fp_defaults=None):
+        self.fps = set()
+        self.ids = set()
+        super().init("IOCFObjectDeal", fp_lists, fp_defaults, join(dp, "conf", "iocf_lists.js"), None)
+    def deal(self, edata:EncapeData):
+        data = edata.data
+        id = xf.g(data, id = None)
+        data = self.fill(data)
+        if id is not None:
+            if id in self.ids:
+                return None
+            else:
+                self.ids.add(id)
+        fp = xf.g(data, filepath = None)
+        fdir = xf.g(data, folder = None)
+        pt = xf.g(data,  pattern = None)
+        if fp is None:
+            if fdir is None:
+                raise Exception("filepath can't be null")
+            else:
+                fdir = self.get_obj(fdir, edata.conf)
+                if pt is not None:
+                    pt = self.get_obj(pt, edata.conf)
+                fps = fz.search(fdir, pt)
+        else:
+            fp = self.get_obj(fp, edata.conf)
+            fps = [fp]
+        fps = [k for k in fps if k not in self.fps]
+        if len(fps)==0:
+            return None
+        edata.conf.confs.add_fps(fps)
+        self.fps.update(fp)
+        return None
+
+pass

{buildz-0.5.3 → buildz-0.5.5}/buildz/ioc/ioc_deal/map.py

@@ -29,7 +29,7 @@ class MapDeal(FormatDeal):
         conf = edata.conf
         data = self.fill(data)
         maps = xf.g(data, data={})
-        rst = {k:self.get_obj(map[k], conf, edata.src, edata.info) for k in maps}
+        rst = {k:self.get_obj(maps[k], conf, edata.src, edata.info) for k in maps}
         return rst
 
 pass

{buildz-0.5.3 → buildz-0.5.5}/buildz/ioc/ioc_deal/obj.py

@@ -102,16 +102,18 @@ class ObjectDeal(FormatDeal):
             single = 1
         ids = None
         if single or cid is not None:
-            if single:
-                ids = [sid, id]
+            if cid is not None:
+                ids = [sid, 'local_id', id, cid]
             else:
-                ids = [sid, id, cid]
+                ids = [sid, 'single', id]
         if ids is not None:
             obj = xf.gets(self.singles, ids)
             if obj is not None:
                 #raise IOCError(f"null for {ids}")
                 return obj
         source = xf.g(data, source=0)
+        if source == 0:
+            raise Exception(f"define object without 'source' key, {data}")
         fc = xf.get(self.sources, source, None)
         if fc is None:
             fc = pyz.load(source)
@@ -131,6 +133,7 @@ class ObjectDeal(FormatDeal):
             xf.sets(self.singles, ids, obj)
         prev_call = xf.g(data, prev_call=None)
         if prev_call is not None:
+            # TODO: 这边info透传好像会有问题
             self.get_obj(prev_call, conf, obj, edata.info)
         sets = xf.g(data, sets=[])
         for kv in sets:

{buildz-0.5.3 → buildz-0.5.5}/buildz/ioc/ioc_deal/ref.py

@@ -28,8 +28,10 @@ class RefDeal(FormatDeal):
         data = self.fill(data)
         key = data['key']
         info = xf.g(data, info=None)
-        if info is not None:
-            info = self.get_obj(info, src = edata.src)
+        if info is not None and type(info)==dict:
+            #info = {k:self.get_obj(info, edata.conf, src = edata.src) for k in info}
+            info = {'type':'map', 'data':info}
+            info = self.get_obj(info, edata.conf, src = edata.src)
         return edata.conf.get_obj(key, info = info, src = edata.src)
 
 pass

{buildz-0.5.3 → buildz-0.5.5}/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.5}/buildz/pyz.py

@@ -1,6 +1,16 @@
 
 import sys
 import os
+def test_current(fp, up = 1):
+    """
+        将当前目录的上{up}层目录加入sys.path，这样可以在同层写测试代码，但是import还是要当在上{up}层做import
+    """
+    dp = os.path.dirname(os.path.abspath(fp))
+    for i in range(up):
+        dp = os.path.dirname(dp)
+    sys.path.insert(0, dp)
+
+pass
 def load(md, fc = None):
     """
         import object(whether module or others) from md(or md.fc)

{buildz-0.5.3 → buildz-0.5.5}/buildz/xf/file.py

@@ -1,7 +1,9 @@
 #coding=utf-8
-
+import os
 coding="utf-8"
 def bread(filepath):
+    if type(filepath) not in [str, bytes, os.PathLike]:
+        raise Exception(f"error filepath: {filepath}")
     with open(filepath, 'rb') as file:
         s = file.read()
     return s
@@ -40,7 +42,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.5}/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.5}/buildz/xf/loaderz/deal/strz.py

@@ -52,7 +52,7 @@ class PrevStrDeal(lr.LRDeal):
             return False
         rm = buffer.full().strip()
         buffer.clean2read(self.ll)
-        if len(rm)>0 and not self.note:
+        if len(rm)>0:
             if not self.note:
                 print("left:", self.left, rm)
                 print(f"rst: [{rst}]")
@@ -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.5}/buildz/xf/loaderz/mg.py

@@ -63,7 +63,7 @@ class Manager:
             rst = deal.build(obj)
             if rst is not None:
                 return rst
-        raise Exception("unspt deal type:"+_type)
+        raise Exception(f"unspt deal type:[{obj}]")
     def deal(self, buffer, arr):
         c = buffer.read()
         if len(c)==0 and buffer.size()==0:

{buildz-0.5.3 → buildz-0.5.5}/buildz/xf/mapz.py

@@ -1,9 +1,43 @@
 
-def get(obj, key, default=None):
+def get(obj, key, default=None, set = False):
     if key not in obj:
+        if set:
+            obj[key] = default
         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 = []
@@ -16,6 +50,20 @@ def g(obj, **maps):
         rst = rst[0]
     return rst
 
+pass
+def gs(obj, **maps):
+    rst = []
+    for k in maps:
+        v = maps[k]
+        if k in obj:
+            v = obj[k]
+        else:
+            obj[k] = v
+        rst.append(v)
+    if len(rst)==1:
+        rst = rst[0]
+    return rst
+
 pass
 def s(obj, **maps):
     for k in maps:
@@ -78,7 +126,7 @@ pass
 def deep_update(target, src, replace=1):
     """
         dict深层更新，src[key]是dict就深入更新，否则:
-            src有而maps没有就替换，否则：
+            src有而target没有就替换，否则：
                 replace=1就替换
     """
     for k in src:
@@ -93,4 +141,5 @@ def deep_update(target, src, replace=1):
             if replace:
                 target[k] = val
 
-pass
+pass
+update = deep_update

{buildz-0.5.3 → buildz-0.5.5}/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.5/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.5
+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.5}/buildz.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ buildz/ioc/ioc_deal/deal.py
 buildz/ioc/ioc_deal/demo.py
 buildz/ioc/ioc_deal/env.py
 buildz/ioc/ioc_deal/ioc.py
+buildz/ioc/ioc_deal/iocf.py
 buildz/ioc/ioc_deal/join.py
 buildz/ioc/ioc_deal/list.py
 buildz/ioc/ioc_deal/map.py
@@ -65,6 +66,7 @@ buildz/ioc/ioc_deal/conf/deal_lists.js
 buildz/ioc/ioc_deal/conf/deals.js
 buildz/ioc/ioc_deal/conf/env_lists.js
 buildz/ioc/ioc_deal/conf/ioc_lists.js
+buildz/ioc/ioc_deal/conf/iocf_lists.js
 buildz/ioc/ioc_deal/conf/join_lists.js
 buildz/ioc/ioc_deal/conf/list_lists.js
 buildz/ioc/ioc_deal/conf/map_lists.js

{buildz-0.5.3 → buildz-0.5.5}/setup.py

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