buildz 0.6.45__tar.gz → 0.6.46__tar.gz

buildz-0.6.46/MANIFEST.in

@@ -0,0 +1,3 @@
+include README.md
+recursive-include buildz *
+recursive-include notes *

{buildz-0.6.45/buildz.egg-info → buildz-0.6.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.45
+Version: 0.6.46
 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.45 → buildz-0.6.46}/buildz/argz/argz.py

@@ -103,12 +103,18 @@ class ArgItem(Base):
         find = False
         for key, vtype in self.trs:
             if vtype =="dict":
-                if key in maps:
-                    val = maps[key]
+                if xf.dhas(maps, key):
+                    val = xf.dget(maps, key)
                     if self.remove:
-                        del maps[key]
-                    find = True
+                        xf.dremove(maps, key)
+                    find=True
                     break
+                #if key in maps:
+                #    val = maps[key]
+                #    if self.remove:
+                #        del maps[key]
+                #    find = True
+                #    break
             else:
                 if key in set_args:
                     val = args[key]
@@ -123,7 +129,8 @@ class ArgItem(Base):
         if not find and self.need:
             raise ArgExp("need", set(self.trs), self.des)
         if self.vtype == 'dict':
-            rst_maps[self.key] = val
+            xf.dset(rst_maps, self.key, val)
+            #rst_maps[self.key] = val
         else:
             rst_args[self.key] = val
 
@@ -135,9 +142,11 @@ class ArgItemBuild(build.Build):
         value = xf.g(conf, value=None)
         des = xf.g(conf, des=None)
         remove = xf.g(conf, remove=True)
-        src = conf['src']
-        if type(src) not in (list, tuple):
-            src = [src]
+        src = xf.g(conf, src=None)
+        srcs = xf.g(conf, srcs = [])
+        if src is not None:
+            srcs.append(src)
+        src = srcs
         item = ArgItem(key, vtype, need, default, value, des, remove)
         for s in src:
             if type(s) not in (list, tuple):

{buildz-0.6.45 → buildz-0.6.46}/buildz/argz/build.py

@@ -1,5 +1,5 @@
 #
-from buildz import Base, xf
+from buildz import Base, xf,pyz
 class Build(Base):
     def init(self, *binds):
         self.builder = None
@@ -11,10 +11,11 @@ class Build(Base):
     def call(self, conf):
         assert 0, 'not impl'
 class Builder(Base):
-    def init(self, fc = None, key_id = "id"):
+    def init(self, fc = None, key_id = "id", default_key = "main"):
         self.vars = {}
         self.confs = {}
         self.key_id = key_id
+        self.df_key = default_key
         self.set_fc(fc)
     def set_fc(self, fc):
         fc.bind(self)
@@ -34,6 +35,12 @@ class Builder(Base):
             conf = self.confs[key]
         return self.fc(conf)
     def conf(self, data):
+        if type(data) == dict:
+            tp = xf.g(data, type=None)
+            if tp is not None and type(tp) not in (list, tuple, dict):
+                if self.key_id not in data:
+                    data[self.key_id] = self.df_key
+                data = [data]
         if type(data) in (list, tuple):
             rst = {}
             for it in data:
@@ -44,5 +51,6 @@ class Builder(Base):
             data = rst
         self.confs = data
         return self
-    def call(self, data, key="main"):
+    def call(self, data, key=None):
+        key = pyz.nnull(key, self.df_key)
         return self.conf(data).get_conf(key)

{buildz-0.6.45 → buildz-0.6.46}/buildz/argz/callz.py

@@ -14,6 +14,9 @@ class Fc(Base):
         if isinstance(fc, Fc):
             return fc
         return Fc(fc)
+class RetFc(Fc):
+    def call(self, args, maps):
+        return args, maps
 class ArgsCall(Fc):
     def init(self, fc, args=None, name = None):
         fc=self.make(fc)
@@ -88,23 +91,34 @@ class FcBuild(build.Build):
         src = xf.g(conf, src = None)
         fc = self.builder.get_var(src)
         return Fc(fc)
+class RetBuild(build.Build):
+    def call(self, conf):
+        ctype = xf.g(conf, type=None)
+        if ctype != "ret":
+            return None
+        return RetFc()
 class CallBuild(build.Build):
     def init(self):
         self.args = argz.ArrArgsBuild()
         self.eval = evalx.EvalBuild()
         self.fc = FcBuild()
         self.calls = CallsBuild()
+        self.ret = RetBuild()
         super().init(self.args, self.eval, self.fc, self.calls)
     def call(self, conf):
         args = self.args(conf)
         judges = self.eval(conf)
         fc = self.fc(conf)
         calls = self.calls(conf)
+        ret = self.ret(conf)
         bfc = fc is None
         bcls = calls is None
-        assert (bfc+bcls)==1
+        bret = ret is None
+        assert (bfc+bcls+bret)==2
         if fc is None:
             fc = calls
+        if fc is None:
+            fc = ret
         if args is not None:
             fc = ArgsCall(fc, args)
         if judges is not None:

{buildz-0.6.45 → buildz-0.6.46}/buildz/argz/tests/conf.js

@@ -22,10 +22,10 @@
     }
     maps: {
         filepath: {
-            src: [f, fp, filepath]
+            srcs: [f, fp, filepath]
         }
         content: {
-            src: [c, ct, content]
+            srcs: [c, ct, content]
         }
     }
-}
+}

buildz-0.6.46/buildz/argz/testx.py

@@ -0,0 +1,42 @@
+from buildz import argz,xf,Base,evalz,pathz
+import sys,os
+
+path = pathz.Path()
+path.set("res", path(path.dir(__file__), "tests"))
+conf = xf.loadf(path.res("conf.js"))
+conf=xf.loads(r"""
+type=ret
+maps={
+    spt: {
+        src: [(env, spt), d]
+        default: 1
+        value: '.'
+    }
+    eglobal: {
+        src: [(env, global), d]
+        default:1
+        value: true
+    }
+}
+""")
+
+mg = argz.CallBuilder()
+fc = mg(conf)
+
+data = xf.loads(r"""
+args=[]
+maps={
+    env: {
+        spt: x
+    }
+}
+""")
+args = xf.g(data, args=[])
+maps = xf.g(data, maps={})
+
+rst = fc(args, maps)
+print(f"rst: {rst}")
+'''
+python -m buildz.argz.testx
+python -m buildz.argz.test search /d/rootz f=asf c=test
+'''

{buildz-0.6.45 → buildz-0.6.46}/buildz/base.py

@@ -1,5 +1,33 @@
 #coding=utf-8
 from . import pyz
+def fcBase(cls, lst=0, keys = tuple()):
+    class _Base(cls):
+        def str(self):
+            return str(self.__class__)
+        def repr(self):
+            return self.str()
+        def __str__(self):
+            return self.str()
+        def __repr__(self):
+            return self.repr()
+        def __call__(self, *a, **b):
+            return self.call(*a, **b)
+        def call(self, *a, **b):
+            return None
+        def init(self, *a, **b):
+            pass
+        def __init__(self, *a, **b):
+            sa = a[:lst]
+            a = a[lst:]
+            sb = {}
+            for k in keys:
+                if k in b:
+                    sb[k] = b[k]
+                    del b[k]
+            super().__init__(*sa, **sb)
+            self.init(*a, **b)
+    return _Base
+
 class Base:
     def str(self):
         return str(self.__class__)

{buildz-0.6.45 → buildz-0.6.46}/buildz/fz/__init__.py

@@ -2,7 +2,7 @@
 #author:
 from .dirz import dirs, FileDeal
 from .lsf import lists, search, searchd,searchs,_search
-from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite, is_abs
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite, is_abs, xors, fxors, coverx, covers, fcovers
 from .fhs import fhash, fhashs
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.45 → buildz-0.6.46}/buildz/fz/fio.py

@@ -56,23 +56,37 @@ pass
 
 dirname = dirpath
 
-def fcover(filepath, wsize = 1024*10):
-	st = os.stat(filepath)
-	size = st.st_size
-	bs = b'a'*wsize
-	with open(filepath, 'wb') as f:
-		for i in range(0, size, wsize):
-			f.write(bs)
+def coverx(sz, chars=None):
+    if chars is None:
+        chars = b"a"
+    if type(chars)==str:
+        chars = chars.encode("utf-8")
+    l = sz//len(chars)
+    cs = chars*l
+    left = sz%len(chars)
+    cs+=chars[:left]
+    return cs
+def fcover(filepath, wsize = 1024*10, chars=None):
+    st = os.stat(filepath)
+    size = st.st_size
+    #print(f"{filepath}:{size}")
+    #bs = b'a'*wsize
+    with open(filepath, 'wb') as f:
+        for i in range(0, size, wsize):
+            sz = min(size-i, wsize)
+            bs = coverx(sz, chars)
+            #print(f"bs: {len(bs)}, sz: {sz}, i:{i}, wsize:{wsize}")
+            f.write(bs)
 
 pass
 cover = fcover
-def removes(fp, cover = False):
+def removes(fp, cover = False,wsize = 1024*10,chars=None):
     if not os.path.exists(fp):
         return
     if os.path.isfile(fp):
         #print(f"remove file '{fp}'")
         if cover:
-            fcover(fp)
+            fcover(fp,wsize=wsize, chars=chars)
         os.remove(fp)
         return
     fps = os.listdir(fp)
@@ -123,4 +137,36 @@ def is_abs(fp):
     return False
 
 pass
-    
+    
+def xors(bs, codes):
+    if type(codes)==str:
+        codes = codes.encode("utf-8")
+    rst = b''
+    codes= list(codes)
+    for i in range(0, len(bs), len(codes)):
+        _bs = bs[i:i+len(codes)]
+        rs = bytes([a^b for a,b in zip(_bs, codes)])
+        rst+=rs
+        codes = codes[1:]+codes[:1]
+    return rst
+
+def fxors(fp, codes, ofp=None):
+    bs = read(fp, 'rb')
+    bs = xors(bs, codes)
+    if ofp is not None:
+        write(bs, ofp, 'wb')
+    else:
+        return bs
+
+pass
+def covers(dp, chars=None,wsize = 1024*10,):
+    if not os.path.exists(dp):
+        return
+    from . import lsf
+    fs = lsf.search(dp)
+    #print(f"fs: {fs}")
+    for fp in fs:
+        fcover(fp,wsize=wsize, chars=chars)
+
+pass
+fcovers = covers

buildz-0.6.46/buildz/iocz/base.py

@@ -0,0 +1,6 @@
+from ..base import Base, fcBase
+from .. import pathz
+path = pathz.Path()
+path.set('local', path.dir(__file__))
+path.set('conf', path.local('conf'),curr=0)
+

buildz-0.6.46/buildz/iocz/ioc/base.py

@@ -0,0 +1,5 @@
+from ..base import *
+basepath = path
+path = pathz.Path()
+path.set("conf", basepath.local("ioc/conf"), curr=0)
+

buildz-0.6.46/buildz/iocz/ioc/confs.py

@@ -0,0 +1,5 @@
+from .ids import Ids
+from .base import Base
+class Confs(Base):
+    '''
+    '''

buildz-0.6.46/buildz/iocz/ioc/env.py

@@ -0,0 +1,117 @@
+from .base import Base, fcBase
+from buildz import xf,pyz
+class EnvExp(Exception):
+    def __init__(self, id):
+        super().__init__(f"EnvExp id not found: '{id}'")
+class BuildEnv(Base):
+    """
+        3种从环境获取参数的方式:
+            从系统环境获取
+            从命令行输入参数获取
+            从本对象环境数据获取
+        2种设置环境参数方式：
+            设置到系统环境
+            设置到本对象环境数据
+    """
+    def init(self, conf):
+        self.conf = conf
+        self.builds = {
+        }
+    def build_args(self):
+        pass
+    def build_conf(self, ids, flush, flush_list, exp, default):
+        return Env(ids, None, flush, flush_list, exp, default)
+    def deal(self, mg, args, spt, eglobal, orders, from_args, flush, flush_list, exp, default):
+        envs = []
+        env = None
+        ids = ids.Ids(spt)
+        if 'conf' not in orders:
+            orders.append('conf')
+        for order in orders:
+            _env = self.builds[order](ids, flush, flush_list, exp, default)
+            if order == 'conf':
+                env = _env
+            envs.append(_env)
+        env = Envs(envs, env)
+        return env
+    def call(self, mg, conf, args):
+        args, maps = self.conf([], conf)
+        return self.deal(mg, args, **maps)
+
+pass
+class Env(Base):
+    def _get(self, id):
+        return xf.dhget(self.maps, id)
+    def _set(self, id, val):
+        return xf.dset(self.maps, id, val)
+    def _has(self, id):
+        return xf.dhas(self.maps, id)
+    def _del(self, id):
+        return xf.dremove(self.maps, id)
+    def _fill(self, maps):
+        return xf.fill(maps, self.maps)
+    def init(self, ids=None, maps=None, flush=True, flush_list = False):
+        self.flush_list = flush_list
+        self.ids = ids
+        self.flush = flush
+        if maps is None:
+            maps = {}
+        if flush:
+            maps=xf.flush_maps(maps, self.ids.ids, flush_list)
+        self.maps = maps
+    def update(self, maps, flush=None, flush_list=None):
+        flush = pyz.nnull(flush, self.flush)
+        flush_list = pyz.nnull(flush_list, self.flush_list)
+        if flush:
+            maps = xf.flush_maps(maps, self.ids.ids, flush_list)
+        self._fill(maps)
+    def has(self, id, flush=None):
+        flush = pyz.not_null(flush, self.flush)
+        full_id = id
+        if flush:
+            ids = self.ids.ids(id)
+        else:
+            ids = id
+        return self._has(ids)
+    def get(self, id, flush=None):
+        flush = pyz.not_null(flush, self.flush)
+        full_id = id
+        if flush:
+            ids = self.ids.ids(id)
+        else:
+            ids = id
+        return self._get(ids)
+    def set(self, id, val, flush=None):
+        flush = pyz.not_null(flush, self.flush)
+        if flush:
+            id = self.ids.ids(id)
+        self._set(self.maps, id, val)
+ 
+class SysEnv(Env):
+    def _get(self, id, exp_def=None):
+        sysdt = os.getenv(id)
+        return sysdt
+    def _has(self, id):
+        dt = self._get(id)
+        return dt is not None
+    def init(self, ids):
+        super().init(ids, flush=False)
+
+class Envs(Env):
+    def init(self, envs, env):
+        self.envs = envs
+        self.env = env
+    def get(self, id):
+        for env in self.envs:
+            if env.has(id):
+                return env.get(id)
+        return self.env.get(id)
+    def set(self, id, val, *a,**b):
+        return self.env.set(id, val, *a,**b)
+    def has(self, id):
+        for env in self.envs:
+            if env.has(id):
+                return True
+        return self.env.has(id)
+    def update(self, maps, *a,**b):
+        return self.env.update(maps,*a,**b)

buildz-0.6.46/buildz/iocz/ioc/ids.py

@@ -0,0 +1,23 @@
+from .base import Base
+class Ids(Base):
+    '''
+    '''
+    def init(self, spt):
+        self.spt = spt
+    def id(self, *ids):
+        if len(ids)==0:
+            return None
+        elif len(ids)==1:
+            if type(ids[0]) in (list, tuple):
+                ids = ids[0]
+        return self.spt.join(ids)
+    def ids(self, id):
+        if type(id) in (list, tuple):
+            return id
+        return id.split(self.spt)
+    def call(self, a,b):
+        a = self.ids(a)
+        b = self.ids(b)
+        return self.id(a,b)
+pass
+

{buildz-0.6.45 → buildz-0.6.46}/buildz/pathz.py

@@ -5,6 +5,11 @@ class Path(Base):
         self.paths = {}
         self.fcs = {}
         self.lasts = {}
+        k = "check_abs"
+        self.check_abs = True
+        if k in maps:
+            self.check_abs = maps[k]
+            del maps[k]
         for k, v in maps.items():
             self.set(k, v)
     @staticmethod
@@ -19,7 +24,11 @@ class Path(Base):
             return os.path.join(*a)
         return os.path.join(path, *a)
     @staticmethod
-    def rfp(paths, *a, last=-1):
+    def rfp(paths, *a, last=-1, check_abs=False):
+        if check_abs and len(a)>0:
+            f = a[0]
+            if f[0]=="/" or f.find(":")>0:
+                return Path.join(*a)
         #print(f"[TESTZ] a: {a}, paths: {paths}")
         #fp = os.path.join(*a)
         for path in paths:
@@ -42,7 +51,7 @@ class Path(Base):
         self.paths[name] = paths
         self.lasts[name] = last
         def fc(*a):
-            return self.rfp(paths, *a, last=last)
+            return self.rfp(paths, *a, last=last, check_abs=self.check_abs)
         self.fcs[name] = fc
     def __getattr__(self, name):
         return self.fcs[name]

{buildz-0.6.45 → buildz-0.6.46}/buildz/pyz.py

@@ -91,6 +91,12 @@ def pypkg():
     """
         return python package path, test on linux and windows
     """
+    try:
+        import buildz
+        import os
+        return os.path.dirname(buildz.__path__[0])
+    except:
+        pass
     import site
     sites = site.getsitepackages()
     if is_windows:
@@ -155,3 +161,56 @@ def mainerr(fc, *args, **maps):
         print("not main:", st.filename)
 
 pass
+
+def not_null(*args, exp_def=None):
+    for v in args:
+        if v is not None:
+            return v
+    return ret_exp_def(exp_def)
+nnull = not_null
+class exp_def_enp:
+    def __init__(self, exp=False, default=None, exp_fc = Exception, exp_args = [], exp_maps = {}):
+        self.exp_fc = exp_fc
+        self.exp_args = exp_args
+        self.exp_maps=exp_maps
+        self.exp = exp
+        self.default = default
+    def __call__(self, exp=None, default=None, exp_fc = None, exp_args=None, exp_maps=None):
+        exp = not_null(exp, self.exp)
+        default = not_null(default, self.default)
+        exp_fc = not_null(exp_fc, self.exp_fc)
+        exp_args=not_null(exp_args, self.exp_args)
+        exp_maps = not_null(exp_maps, self.exp_maps)
+        if exp:
+            raise exp_fc(*exp_args, **exp_maps)
+        return default
+pass
+def default(val):
+    return exp_def_enp(False, val)
+
+exp_def = exp_def_enp
+def ret_exp_def(val):
+    if isinstance(val, exp_def_enp):
+        return val()
+    return val
+
+def decode(s, coding = 'utf-8'):
+    coding = coding.lower()
+    xcoding = 'utf-8'
+    if coding == 'utf-8':
+        xcoding = 'gbk'
+    try:
+        return s.decode(coding)
+    except:
+        return s.decode(xcoding)
+
+pass
+def encode(bs, coding="utf-8"):
+    coding = coding.lower()
+    xcoding = 'utf-8'
+    if coding == 'utf-8':
+        xcoding = 'gbk'
+    try:
+        return bs.encode(coding)
+    except:
+        return bs.encode(xcoding)