buildz 0.6.7__tar.gz → 0.6.8__tar.gz

{buildz-0.6.7/buildz.egg-info → buildz-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.7
+Version: 0.6.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.6.7 → buildz-0.6.8}/buildz/ioc/ioc/base.py

@@ -30,7 +30,7 @@ class EncapeData(Base):
         包含data id对应的配置，配置文件id，配置文件对象
         [object.test, call, ]
     """
-    def __init__(self, data, conf, local = False, type = None, src = None, info = None):
+    def __init__(self, data, conf=None, local = False, type = None, src = None, info = None, confs = None):
         """
             data: 配置数据
             conf: 配置数据对应的配置文件的管理器
@@ -56,16 +56,21 @@ class EncapeData(Base):
                         raise IOCError("only dict can be a parent: "+pid)
                     self.update_maps(data, pdt, replace=0)
         self.data = data
-        self.sid = conf.id
+        if conf is not None:
+            self.sid = conf.id
+            if type is None:
+                type = conf.confs.get_data_type(data, 0, conf.default_type())
+            if confs is None:
+                confs = conf.confs
         self.src = src
         self.conf = conf
-        self.confs = conf.confs
+        self.confs = confs
         self.local = local
-        if type is None:
-            type = conf.confs.get_data_type(data, 0, conf.default_type())
         self.type = type
         self.info = info
     def deal(self, remove = False):
+        if self.conf is None:
+            return self.confs.get(self, src = self.src, info=self.info, remove = remove)
         return self.conf.get(self, src = self.src, info=self.info, remove = remove)
 
 

{buildz-0.6.7 → buildz-0.6.8}/buildz/ioc/ioc/conf.py

@@ -200,6 +200,10 @@ class Conf(Base):
         if conf is None:
             raise IdNotFoundError(f"can't find conf of {id}")
             return None
+        if conf.conf is None:
+            if remove:
+                return None
+            return conf.data()
         deal = self.get_deal(conf.type)
         if deal is None:
             raise IOCError(f"can't find deal of {id}, type = {conf.type}")

{buildz-0.6.7 → buildz-0.6.8}/buildz/ioc/ioc/confs.py

@@ -231,8 +231,15 @@ class Confs(Base):
         self.envs_args = None
         self.mark_init = False
         self.vars = {}
+        self.fcs = {}
         if 'args' in self.env_orders:
             self.build_env_args()
+    def set_fc(self, key, fc):
+        self.fcs[key] = fc
+    def get_fc(self, key):
+        if key not in self.fcs:
+            return None
+        return self.fcs[key]
     def get_var(self, key, i=-1):
         if not self.has_var(key):
             return None, False
@@ -368,6 +375,10 @@ class Confs(Base):
         if conf is None:
             raise IdNotFoundError(f"confs: can't find conf of {id}")
             return None
+        if conf.conf is None:
+            if remove:
+                return None
+            return conf.data()
         deal = self.get_deal(conf.type, sid)
         if deal is None:
             raise IOCError(f"confs: can't find deal of {id}, type = {conf.type}")
@@ -417,6 +428,9 @@ class Confs(Base):
                 _conf = conf.get_data(id, sid==conf.id, False, src = src, info = info)
                 if _conf is not None:
                     return _conf
-        return None
+        fc = self.get_fc(id)
+        if fc is None:
+            return None
+        return EncapeData(fc, confs=self)
 
 pass

{buildz-0.6.7 → buildz-0.6.8}/buildz/ioc/ioc/single.py

@@ -41,21 +41,27 @@ class Single(Base):
             else:
                 ids = [sid, 'single', id]
         return ids
-    def get(self, edata:EncapeData):
-        ids = self.get_ids(edata)
+    def get_by_ids(self, ids):
         if ids is None:
             return None
         obj = xf.gets(self.singles, ids)
         return obj
-    def set(self, obj, edata:EncapeData):
+    def get(self, edata:EncapeData):
         ids = self.get_ids(edata)
+        return self.get_by_ids(ids)
+    def set_by_ids(self, ids, obj):
         if ids is None:
             return
         xf.sets(self.singles, ids, obj)
-    def remove(self,edata:EncapeData):
+    def set(self, obj, edata:EncapeData):
         ids = self.get_ids(edata)
+        self.set_by_ids(ids, obj)
+    def rm_by_ids(self, idsj):
         if ids is None:
             return
         xf.removes(self.singles, ids)
+    def remove(self,edata:EncapeData):
+        ids = self.get_ids(edata)
+        self.rm_by_ids(ids)
 
 pass

{buildz-0.6.7 → buildz-0.6.8}/buildz/ioc/ioc_deal/obj.py

@@ -1,5 +1,6 @@
 #
 from ..ioc.base import Base, EncapeData,IOCError
+from ..ioc.single import Single
 from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
@@ -59,6 +60,7 @@ class ObjectDeal(FormatDeal):
     """
     def init(self, fp_lists = None, fp_defaults = None, fp_cst = None, fp_set = None):
         self.singles = {}
+        self.single = Single("single", "id", 1)
         self.sources = {}
         super().init("ObjectDeal", fp_lists, fp_defaults, 
             join(dp, "conf", "obj_lists.js"),
@@ -100,28 +102,13 @@ class ObjectDeal(FormatDeal):
                 icst = None
             isets = xf.g(info, sets = None)
             ivars = xf.g(info, vars=None)
-        else:
-            cid = None
+        ids = self.single.get_ids(edata)
         id = xf.g(data, id = None)
-        single = xf.g(data, single=None)
-        if id is None:
-            single = 0
-        if single is None:
-            single = 1
-        ids = None
-        if single or cid is not None:
-            if cid is not None:
-                ids = [sid, 'local_id', id, cid]
-            else:
-                if icst is not None or isets is not None:
-                    raise Exception("set info.construct/info.sets while using single without info.id")
-                ids = [sid, 'single', id]
         #print(f"obj.deal ids: {ids} for {data}")
-        if ids is not None:
-            obj = xf.gets(self.singles, ids)
-            if obj is not None:
-                #raise IOCError(f"null for {ids}")
-                return obj
+        obj = self.single.get_by_ids(ids)
+        if obj is not None:
+            #raise IOCError(f"null for {ids}")
+            return obj
         #source = xf.g(data, source=0)
         source = xf.g1(data, source=0, src=0)
         if source == 0:
@@ -148,9 +135,11 @@ class ObjectDeal(FormatDeal):
         self.push_vars(conf, ivars)
         args = [self.get_obj(v, conf) for v in args]
         maps = {k:self.get_obj(maps[k], conf) for k in maps}
+        obj = self.single.get_by_ids(ids)
+        if obj is not None:
+            return obj
         obj = fc(*args, **maps)
-        if ids is not None:
-            xf.sets(self.singles, ids, obj)
+        self.single.set_by_ids(ids, obj)
         prev_call = xf.g(data, prev_call=None)
         if prev_call is not None:
             # TODO: 这边info透传不知道会不会有问题
@@ -190,23 +179,8 @@ class ObjectDeal(FormatDeal):
         info = edata.info
         conf = edata.conf
         confs = edata.confs
-        if type(info) == dict:
-            cid = xf.g(info, id=None)
-        else:
-            cid = None
-        id = xf.g(data, id = None)
-        single = xf.g(data, single=None)
-        if id is None:
-            single = 0
-        ids = None
-        if single or cid is not None:
-            if single:
-                ids = [sid, id]
-            else:
-                ids = [sid, id, cid]
-        if ids is None:
-            return None
-        obj = xf.gets(self.singles, ids)
+        ids = self.single.get_ids(edata)
+        obj = self.single.get_by_ids(ids)
         if obj is None:
             return None
         call = xf.g(data, remove=None)

{buildz-0.6.7 → buildz-0.6.8}/buildz/pyz.py

@@ -2,6 +2,8 @@
 import sys
 import os
 import hashlib
+import inspect
+from .base import Base
 class With:
     def __init__(self, fc_in, fc_out, args = False):
         self.fc_in = fc_in
@@ -125,3 +127,23 @@ class Pth:
 pass
 
 _pth = Pth()
+def main(name, fc, *args, **maps):
+    if name=="__main__":
+        fc(*args, **maps)
+
+pass
+
+def bylocals(mlocals, fc, *args, **maps):
+    if mlocals['__name__']=="__main__":
+        fc(*args, **maps)
+
+pass
+
+def mainerr(fc, *args, **maps):
+    st = inspect.stack()[1]
+    if st.filename == '<stdin>':
+        fc(*args, **maps)
+    else:
+        print("not main:", st.filename)
+
+pass

buildz-0.6.8/buildz/tools.py

@@ -0,0 +1,3 @@
+#coding=utf-8
+# from buildz.tools import *
+from . import pyz,xf,fz,Base

{buildz-0.6.7 → buildz-0.6.8}/buildz/xf/__init__.py

@@ -1,5 +1,5 @@
 
-from .readz import loads, load, loadf
+from .readz import loads, load, loadf, loads_args, loadx, is_args
 from .write import dumps, dump, dumpf
 from .file import *
 from .mapz import *

buildz-0.6.8/buildz/xf/loaderz/deal/listmapz.py

@@ -0,0 +1,57 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+from buildz import Base
+class Args(Base):
+    def str(self):
+        return f"<Args args={self.args}, maps={self.maps}>"
+    def init(self, args, maps):
+        self.args = args
+        self.maps = maps
+
+pass
+class ListMapDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        super().init(left, right, "listmap")
+    def types(self):
+        return ['list']
+    def build(self, obj):
+        # if self.check_right(obj):
+        #     return None
+        val = obj.val
+        if len(val)==0:
+            obj.val = []
+            obj.is_val = 1
+            return obj
+        return self.build_arr(val)
+    def build_arr(self, arr):
+        rst = {}
+        lst = []
+        mp = {}
+        i = 0
+        while i<len(arr):
+            obj = arr[i]
+            opt = None
+            if i+1<len(arr):
+                opt = arr[i+1]
+            if opt is not None and opt.type == 'kv':
+                if i+2>=len(arr):
+                    raise Exception(f"u f in listmap: {arr}")
+                val = arr[i+2]
+                mp[obj.val]=val.val
+                i+=3
+            else:
+                lst.append(obj.val)
+                i+=1
+        if len(mp)==0:
+            return item.Item(lst, type="list", is_val=1)
+        elif len(lst)==0:
+            return item.Item(mp, type="map", is_val=1)
+        else:
+            return item.Item(Args(lst, mp), type='args', is_val=1)
+
+pass

{buildz-0.6.7 → buildz-0.6.8}/buildz/xf/loaderz/deal/listz.py

@@ -9,13 +9,14 @@ class ListDeal(lr.LRDeal):
     def init(self, left, right):
         super().init(left, right, 'list')
     def types(self):
-        return ['str','list']
+        return ['list']
     def build(self, obj):
-        if self.check_right(obj):
-            return None
+        #print(f"list build: {obj}")
+        #if self.check_right(obj):
+        #    return None
         val = obj.val
         if len(val)==0:
-            obj.val = ''
+            obj.val = []
             obj.is_val = 1
             return obj
         if len(val)>1:

{buildz-0.6.7 → buildz-0.6.8}/buildz/xf/loaderz/deal/mapz.py

@@ -9,13 +9,13 @@ class MapDeal(lr.LRDeal):
     def init(self, left, right):
         super().init(left, right, "map")
     def types(self):
-        return ['list','str']
+        return ['list']
     def build(self, obj):
-        if self.check_right(obj):
-            return None
+        #if self.check_right(obj):
+        #    return None
         val = obj.val
         if len(val)==0:
-            obj.val = ''
+            obj.val = {}
             obj.is_val = 1
             return obj
         if len(val)%3!=0:

{buildz-0.6.7 → buildz-0.6.8}/buildz/xf/loaderz/item.py

@@ -7,13 +7,14 @@ remain和type？
 '''
 class Item:
     def __str__(self):
-        return f"<Item val={self.val}, type = {self.type}, is_val = {self.is_val}>"
+        return f"<Item val={self.val}, type = {self.type}, is_val = {self.is_val}, others={self.others}>"
     def __repr__(self):
         return str(self)
-    def __init__(self, val, type = None, is_val=False):
+    def __init__(self, val, type = None, is_val=False, others = None):
         self.val= val
         self.is_val= is_val
         self.type = type
+        self.others=others
 
 pass
 class NoneItem:

{buildz-0.6.7 → buildz-0.6.8}/buildz/xf/loaderz/mg.py

@@ -97,13 +97,18 @@ class Manager:
         #         if len(k.strip())==0:
         #             continue
         #     rst.append(k)
+        #print(f"mg arr: {arr}")
         arr = self.build_arr(arr)
+        #print(f"mg arr: {arr}")
         obj = item.Item(arr, type = "list", is_val = 0)
         obj = self.build(obj)
         #arr = rst
         #if len(arr)==1:
         #    arr = arr[0]
         val = obj.val
+        #print(f"mg val:{val}")
+        if type(val) in [list,map] and len(val)==0:
+            val = ""
         if type(val)==list and len(val)==1:
             val = val[0]
         return val

{buildz-0.6.7 → buildz-0.6.8}/buildz/xf/readz.py

@@ -1,7 +1,7 @@
 
 from .loaderz import mg, buffer, base
 from . import file
-from .loaderz.deal import nextz, spt, strz, listz, spc, setz, mapz, reval, lrval
+from .loaderz.deal import nextz, spt, strz, listz, spc, setz, mapz, reval, lrval, listmapz
 class BoolFc:
     def __init__(self, mg):
         trues = [mg.like(k) for k in ["true", "True", "1"]]   
@@ -77,10 +77,73 @@ def build(as_bytes=False):
     g_mg = mgs
     return mgs
 
+pass
+g_mgx = None
+def build_args(as_bytes=False):
+    global g_mgx
+    if g_mgx is not None and g_mgx.as_bytes == as_bytes:
+        return g_mgx
+    mgs = mg.Manager(as_bytes)
+    mgs.add(setz.SetDeal(':'))
+    mgs.add(setz.SetDeal('='))
+    mgs.add(spt.PrevSptDeal(",",1))
+    mgs.add(spt.PrevSptDeal(';',1))
+    mgs.add(spt.PrevSptDeal('\n'))
+    mgs.add(spt.PrevSptDeal(' '))
+    build_lrval(mgs)
+    # mgs.add(listz.ListDeal("(", ")"))
+    # mgs.add(listz.ListDeal("[", "]"))
+    # mgs.add(mapz.MapDeal("{", "}"))
+    mgs.add(listmapz.ListMapDeal("(", ")"))
+    mgs.add(listmapz.ListMapDeal("[", "]"))
+    mgs.add(listmapz.ListMapDeal("{", "}"))
+    build_val(mgs)
+    #1,0,0,1: 没引号当r"..."
+    #1,0,1,1: 没引导当"..."
+    mgs.add(strz.PrevStrDeal("r'''","'''",0,0,0))
+    mgs.add(strz.PrevStrDeal('r"""','"""',0,0,0))
+    mgs.add(strz.PrevStrDeal("r'","'",1,0,0,1))
+    mgs.add(strz.PrevStrDeal('r"','"',1,0,0))
+    mgs.add(strz.PrevStrDeal("###","###",0,1))
+    mgs.add(strz.PrevStrDeal("/*","*/",0,1))
+    mgs.add(strz.PrevStrDeal("'''","'''",0,0,1))
+    mgs.add(strz.PrevStrDeal('"""','"""',0,0,1))
+    mgs.add(strz.PrevStrDeal("#","\n",1,1))
+    mgs.add(strz.PrevStrDeal("//","\n",1,1))
+    mgs.add(strz.PrevStrDeal("'","'",1,0,1))
+    mgs.add(strz.PrevStrDeal('"','"',1,0,1))
+    mgs.add(nextz.PrevNextDeal())
+    g_mgx = mgs
+    return mgs
+
 pass
 def load(read, as_bytes = False):
     mgs = build(as_bytes)
     return msg.loads(read)
+
+pass
+def is_args(obj):
+    return type(obj)==listmapz.Args
+
+pass
+def loads_args(s, as_args = False, as_bytes = False):
+    mgs = build_args(type(s)==bytes)
+    #input = buffer.BufferInput(s)
+    rst = mgs.loads(s)
+    if not as_args:
+        return rst
+    if is_args(rst):
+        return rst
+    if type(rst) not in [list, dict]:
+        rst = [rst]
+    if type(rst)==list:
+        rst = [rst, {}]
+    else:
+        rst = [[], rst]
+    return listmapz.Args(*rst)
+
+pass
+loadx = loads_args
 def loads(s):
     mgs = build(type(s)==bytes)
     #input = buffer.BufferInput(s)
@@ -95,4 +158,4 @@ def loadf(fp, bts = False):
         s = file.fread(fp)
     return loads(s)
 
-pass
+pass

{buildz-0.6.7 → buildz-0.6.8/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.7
+Version: 0.6.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.6.7 → buildz-0.6.8}/buildz.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ buildz/argx.py
 buildz/base.py
 buildz/cmd.py
 buildz/pyz.py
+buildz/tools.py
 buildz.egg-info/PKG-INFO
 buildz.egg-info/SOURCES.txt
 buildz.egg-info/dependency_links.txt
@@ -133,6 +134,7 @@ buildz/xf/loaderz/mg.py
 buildz/xf/loaderz/pos.py
 buildz/xf/loaderz/test.py
 buildz/xf/loaderz/test1.py
+buildz/xf/loaderz/deal/listmapz.py
 buildz/xf/loaderz/deal/listz.py
 buildz/xf/loaderz/deal/lr.py
 buildz/xf/loaderz/deal/lrval.py

{buildz-0.6.7 → buildz-0.6.8}/setup.py

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