buildz 0.5.1__tar.gz → 0.5.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.1
+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
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

buildz-0.5.3/buildz/ioc/base.py

@@ -0,0 +1,4 @@
+#coding=utf-8
+
+from .ioc.base import *
+from .ioc_deal.base import BaseDeal, FormatDeal

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc/base.py

@@ -47,6 +47,7 @@ class EncapeData(Base):
                     raise IOCError("only dict can be a parent: "+pid)
                 data = dict(data)
                 self.update_maps(data, pdt, replace=0)
+                del data['parent']
         self.data = data
         self.sid = conf.id
         self.src = src
@@ -57,5 +58,8 @@ class EncapeData(Base):
             type = conf.confs.get_data_type(data, 0, conf.default_type())
         self.type = type
         self.info = info
+    def deal(self, remove = False):
+        return self.conf.get(self, src = self.src, info=self.info, remove = remove)
+
 
 pass

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc/conf.py

@@ -3,6 +3,7 @@ from buildz import xf, pyz
 from buildz.xf import g as xg
 import json
 from .base import Base, EncapeData,IOCError
+from builtins import id as _id
 class Conf(Base):
     """
         配置文件格式：
@@ -84,6 +85,7 @@ class Conf(Base):
         self._default_type = xf.g(conf, default_type = None)
         self.envs = xf.g(conf, envs = {})
         self.confs.flush_env(self.envs)
+        self.confs.update_env(self.envs)
         for _type in list(self.deals.keys()):
             conf = self.deals[_type]
             if type(conf) in [list, tuple]:
@@ -114,17 +116,7 @@ class Conf(Base):
     def get_env(self, id, search_confs = True):
         if self.confs.global_env and search_confs:
             return self.confs.get_env(id, self.id)
-        ids = self.confs.env_ids(id)
-        envs = self.envs
-        find = None
-        for id in ids:
-            if type(envs)!=dict:
-                envs = None
-                break
-            if id not in envs:
-                envs = None
-                break
-            envs = envs[id]
+        envs = self.confs.get_env_maps(id, self.envs)
         if envs is not None:
             return envs
         if not search_confs:
@@ -145,12 +137,20 @@ class Conf(Base):
         self.do_init()
         if id in self.datas:
             obj = self.datas[id]
-            return EncapeData(obj, self, local = False, src=src, info = info)
+            edata = EncapeData(obj, self, local = False, src=src, info = info)
+            if _id(obj) != _id(edata.data):
+                # 有parent，做了填充，用填充后的替换
+                self.datas[id] = edata.data
+            return edata
         if not local:
             return None
         if id in self.locals:
             obj = self.locals[id]
-            return EncapeData(obj, self, local = True, src=src, info = info)
+            edata = EncapeData(obj, self, local = True, src=src, info = info)
+            if _id(obj) != _id(edata.data):
+                # 有parent，做了填充，用填充后的替换
+                self.locals[id] = edata.data
+            return edata
         if not search_confs:
             return None
         return self.confs.get_data(id, self.id, src=src, info = info)
@@ -164,7 +164,11 @@ class Conf(Base):
         """
             根据data id获取data对象，处理逻辑：根据data id查配置，根据配置的type查deal，返回deal处理过的配置
         """
-        conf = self.get_data(id, src = src, info = info)
+        self.do_init()
+        if type(id) == EncapeData:
+            conf = id
+        else:
+            conf = self.get_data(id, src = src, info = info)
         if conf is None:
             raise IOCError(f"can't find conf of {id}")
             return None

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc/confs.py

@@ -55,6 +55,7 @@ class Confs(Base):
         data = xf.args()
         env = data['env']
         self.envs_args = env
+        self.flush_env(self.envs_args)
     def build_env_args_buildz(self):
         args, maps = argx.fetch()
         e = xf.get(maps, e = [])
@@ -63,22 +64,25 @@ class Confs(Base):
         env = [k.split("=") for k in env]
         env = {k[0]:"=".join(k[1:]) for k in env}
         self.envs_args = env
+        self.flush_env(self.envs_args)
+    def build_env_args(self):
+        if self.args_type == "xf":
+            self.build_env_args_xf()
+        else:
+            self.build_env_args_buildz()
     def get_env_args(self, id, sid=None):
-        if self.envs_args is not None:
-            if self.args_type == "xf":
-                self.build_env_args_xf()
-            else:
-                self.build_env_args_buildz()
-        return xf.get(self.envs_args, id)
+        if self.envs_args is None:
+            self.build_env_args()
+        return self.get_env_maps(id, self.envs_args)
     def get_env_local(self, id, sid=None):
         if sid is not None and not self.global_env:
             val = self.confs[sid].get_env(id, False)
             if val is not None:
                 return val
         return None
-    def get_env_conf(self, id, sid=None):
+    def get_env_maps(self, id, maps):
         ids = self.env_ids(id)
-        envs = self.envs
+        envs = maps
         for id in ids:
             if type(envs)!=dict:
                 envs = None
@@ -88,6 +92,8 @@ class Confs(Base):
                 break 
             envs = envs[id]
         return envs
+    def get_env_conf(self, id, sid=None):
+        return self.get_env_maps(id, self.envs)
     def get_env(self, id, sid=None):
         for key in self.env_orders:
             fc = self.env_fcs[key]
@@ -117,6 +123,8 @@ class Confs(Base):
         obj = {id:val}
         self.flush_env(obj)
         self.update_maps(self.envs, obj)
+    def update_env(self, obj):
+        self.update_maps(self.envs, obj)
     def set_deal(self, type, fc):
         self.deals[type] = fc
     def init_fp(self, fp):
@@ -205,7 +213,7 @@ class Confs(Base):
         self.data_index_type = xf.g(conf, data_index_type = [0,1])
         self.deal_key_type = xf.g(conf, deal_key_type = 'type')
         self.deal_index_type = xf.g(conf, deal_index_type = 0)
-        self.env_orders = xf.g(conf, env_orders = ['args', 'sys', 'local', 'conf'])
+        self.env_orders = xf.g(conf, env_orders = ['sys', 'local', 'conf'])
         self.env_fcs = {
             'args': self.get_env_args,
             'sys': self.get_env_sys,
@@ -221,6 +229,8 @@ class Confs(Base):
         self.envs = {}
         self.envs_args = None
         self.mark_init = False
+        if 'args' in self.env_orders:
+            self.build_env_args()
     def do_init(self):
         if self.mark_init:
             return
@@ -239,6 +249,7 @@ class Confs(Base):
             obj = obj[self.data_index_id[1]]
         return obj
     def get_data_type(self, obj, type_first = 1, default = None):
+        self.do_init()
         if type(obj)==dict:
             if self.data_key_type not in obj:
                 return default
@@ -314,7 +325,10 @@ class Confs(Base):
             根据data id获取data对象，处理逻辑：根据data id查配置，根据配置的type查deal，返回deal处理过的配置
         """
         self.do_init()
-        conf = self.get_data(id, sid, src=src, info = info)
+        if type(id) == EncapeData:
+            conf = id
+        else:
+            conf = self.get_data(id, sid, src=src, info = info)
         if conf is None:
             raise IOCError(f"confs: can't find conf of {id}")
             return None

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/base.py

@@ -117,11 +117,38 @@ class FormatData(Base):
 
 pass
 
-
 class BaseDeal(Base):
-    def init(self, name = "BaseDeal", fp_lists = None, fp_defaults = None, df_fp_lists=None, df_fp_defaults=None):
-        self.singles = {}
-        self.sources = {}
+    """
+        基础处理类，加了一些方便处理的方法，自己写的处理可以不用继承这个
+        自己实现的处理类，要实现两个方法：__call__(self, edata:EncapeData)和remove(self, edata:EncapeData)
+        其中remove可以只写个空方法
+    """
+    def get_obj(self, data, conf, src = None, info = None):
+        if type(data) not in [list, dict, tuple]:
+            i = conf.confs.data_index_type[0]
+            data = [conf.default_type(), data]
+            if i != 0:
+                data.reverse()
+        _type = conf.confs.get_data_type(data, 1, conf.default_type())
+        edata = EncapeData(data, conf, local=True, type=_type, src = src, info = info)
+        return edata()
+        deal = conf.get_deal(edata.type)
+        if deal is None:
+            return None
+        return deal(edata)
+    def deal(self, edata:EncapeData):
+        """
+        """
+        return None
+    def remove(self, edata:EncapeData):
+        return None
+
+pass
+class FormatDeal(BaseDeal):
+    """
+        格式化处理类，加了自动装填，但感觉不太好用（一方面忘记写注释，写的时间久了，不知道要怎么用了，另一方面不好扩展，再一方面自动填充要消耗时间））
+    """
+    def init(self, name = "FormatDeal", fp_lists = None, fp_defaults = None, df_fp_lists=None, df_fp_defaults=None):
         if fp_lists is None:
             fp_lists = df_fp_lists
         if fp_defaults is None:
@@ -145,13 +172,10 @@ class BaseDeal(Base):
                 data.reverse()
         _type = conf.confs.get_data_type(data, 1, conf.default_type())
         edata = EncapeData(data, conf, local=True, type=_type, src = src, info = info)
+        return edata()
         deal = conf.get_deal(edata.type)
         if deal is None:
             return None
         return deal(edata)
-    def deal(self, edata:EncapeData):
-        return None
-    def remove(self, edata:EncapeData):
-        return None
 
 pass

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/call.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class CallDeal(BaseDeal):
+class CallDeal(FormatDeal):
     """
     函数调用call:
         {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/calls.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class CallsDeal(BaseDeal):
+class CallsDeal(FormatDeal):
     """
     函数调用序列calls:
         {

buildz-0.5.3/buildz/ioc/ioc_deal/deal.py

@@ -0,0 +1,86 @@
+#coding=utf-8
+from ..ioc.base import Base, EncapeData,IOCError
+from .base import FormatData,FormatDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+class DealDeal(FormatDeal):
+    """
+        扩展的好处是自定义格式，除了id,type和parent字段，其他字段可以自己加
+        假设生成个test.Demo，构造函数只有一个字段val
+        {
+            id: test
+            type: object
+            source: test.Demo
+            construct: {
+                args: [
+                    (val, 'demo')
+                ]
+            }
+        }
+        自己写个生成特定对象的处理类:
+        配置文件1 def_demo.js:
+        {
+            datas:[
+                {
+                    id: obj.demo.deal
+                    type: object
+                    source: test.BuildDemo
+                }
+                {
+                    id: demo.deal
+                    type: deal
+                    source: obj.demo.deal
+                    target: demo.deal
+                }
+            ]
+            //inits初始化
+            inits: [
+                demo.deal
+            ]
+        }
+        配置文件2 demo.js:
+        //只有datas的时候可以简写成只写datas列表里的数据
+        [
+            {
+                id: test
+                type: demo.deal
+                val: "demo"
+            }
+        ]
+        调用后会注册到conf的deal上，用于扩展deals配置
+        deal字段deal:
+            {
+                id:id
+                type: deal
+                target: type
+                source: id # 要求source实现了方法__call__(self, edata:EncapeData)
+            }
+        简写:
+            [[id, deal], target, source]
+            [deal, target, source]
+        例:
+            [deal, target, source] //
+    """
+    def init(self, fp_lists=None, fp_defaults=None):
+        super().init("DealDeal", fp_lists, fp_defaults, join(dp, "conf", "deal_lists.js"), None)
+    def deal(self, edata:EncapeData):
+        data = edata.data
+        source = xf.g(data, source=None)
+        if source is None:
+            raise IOCError("not source in dealdeal")
+        target = xf.g(data, target=None)
+        if target is None:
+            raise IOCError("not target in dealdeal")
+        obj = edata.conf.get(source)
+        if obj is None:
+            raise IOCError("source object not found in dealdeal")
+        targets = target
+        if type(targets) != list:
+            targets = [targets]
+        for target in targets:
+            edata.conf.set_deal(target, obj)
+        return None
+
+pass

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/env.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class EnvDeal(BaseDeal):
+class EnvDeal(FormatDeal):
     """
         环境变量env:
             {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/ioc.py

@@ -1,11 +1,11 @@
 #coding=utf-8
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class IOCObjectDeal(BaseDeal):
+class IOCObjectDeal(FormatDeal):
     """
         ioc字段ioc:
             {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/join.py

@@ -1,11 +1,11 @@
 #coding=utf-8
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class JoinDeal(BaseDeal):
+class JoinDeal(FormatDeal):
     """
     文件路径合并join:
         {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/list.py

@@ -1,11 +1,11 @@
 #coding=utf-8
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class ListDeal(BaseDeal):
+class ListDeal(FormatDeal):
     """
         list:
             {

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

@@ -1,11 +1,11 @@
 #coding=utf-8
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class MapDeal(BaseDeal):
+class MapDeal(FormatDeal):
     """
     map:
         {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/mcall.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class MethodCallDeal(BaseDeal):
+class MethodCallDeal(FormatDeal):
     """
     对象方法调用:
         {

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

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData,IOCError
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class ObjectDeal(BaseDeal):
+class ObjectDeal(FormatDeal):
     """
         对象object:
             {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/ovar.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class ObjectVarDeal(BaseDeal):
+class ObjectVarDeal(FormatDeal):
     """
         对象变量ovar:
             {

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

@@ -1,11 +1,11 @@
 #coding=utf-8
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class RefDeal(BaseDeal):
+class RefDeal(FormatDeal):
     """
         引用ref:
             {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/var.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class VarDeal(BaseDeal):
+class VarDeal(FormatDeal):
     """
         代码变量var:
             {

{buildz-0.5.1 → buildz-0.5.3}/buildz/ioc/ioc_deal/xfile.py

@@ -1,11 +1,11 @@
 #
 from ..ioc.base import Base, EncapeData
-from .base import FormatData,BaseDeal
+from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
-class XfileDeal(BaseDeal):
+class XfileDeal(FormatDeal):
     """
     配置文件载入xfile/xf:
         {

{buildz-0.5.1 → buildz-0.5.3}/buildz/xf/__init__.py

@@ -1,6 +1,6 @@
 
-from .readz import loads, load
-from .write import dumps, dump
+from .readz import loads, load, loadf
+from .write import dumps, dump, dumpf
 from .file import *
 from .mapz import *
 from .xargs import fetch as args

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

@@ -38,4 +38,10 @@ def fread_c(filepath, coding = 'utf-8'):
     s = bread(filepath)
     return decode_c(s, coding)
 
-pass
+pass
+
+def fwrite(filepath, content, mode = 'w'):
+    with open(filepath, mode) as f:
+        f.write(content)
+
+pass

buildz-0.5.3/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.1 → buildz-0.5.3}/buildz/xf/loaderz/deal/lr.py

@@ -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.1 → buildz-0.5.3}/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}")