buildz 0.5.5__tar.gz → 0.5.7__tar.gz

{buildz-0.5.5/buildz.egg-info → buildz-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.5
+Version: 0.5.7
 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

{buildz-0.5.5 → buildz-0.5.7}/buildz/fz/__init__.py

@@ -1,7 +1,7 @@
 #coding=utf-8
 #author:
 from .dirz import dirs, FileDeal
-from .lsf import lists, search
-from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir
+from .lsf import lists, search, searchd,searchs,_search
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

buildz-0.5.7/buildz/fz/dirz.py

@@ -0,0 +1,74 @@
+#coding=utf-8
+import os
+class FileInfo:
+    def __repr__(self):
+        return self.__str__()
+    def __str__(self):
+        return f"<path='{self.path}', rpath='{self.rpath}' isdir={self.isdir}>"
+    def __init__(self, path, rpath, base_dir, isdir, empty_dir=False, visit_dir = False):
+        self.path = path
+        self.rpath = rpath
+        self.base_dir = base_dir
+        self.isdir = isdir
+        self.empty_dir = empty_dir
+        self.visit_dir = visit_dir
+
+pass
+#列出文件夹下所有文件和文件更新时间
+#文件访问处理方法
+#建议visit读取文件
+#catch处理目录访问异常
+class FileDeal:
+    def __init__(self, *argv, **maps):
+        self.init(*argv, **maps)
+    def result(self):
+        return None
+    def init(self, *argv, **maps):
+        pass
+    def work(self, *argv, **maps):
+        return self.dirs(*argv, **maps)
+    def dirs(self, filepath, depth = 0):
+        dirs(filepath, self, depth)
+        return self.result()
+    def visit(self, fileinfo, depth):
+        return True
+    def catch(self, filepinfo, depth, exp):
+        pass
+    def deal(self, filepinfo, depth, exp = None):
+        if exp is None:
+            return self.visit(filepinfo, depth)
+        else:
+            return self.catch(filepinfo, depth, exp)
+    def __call__(self, *argv, **maps):
+        return self.deal(*argv, **maps)
+
+pass
+#遍历文件／文件夹filepath
+def dirs(filepath, fc=FileDeal(), depth = 0, base_dir = None, rpath = None):
+    if base_dir is None:
+        base_dir = filepath
+    if rpath is None:
+        rpath = ""
+    isdir = os.path.isdir(filepath)
+    finfo = FileInfo(filepath, rpath, base_dir, isdir)
+    visit = fc(finfo, depth)
+    if isdir and visit:
+        try:
+            files = os.listdir(filepath)
+        except Exception as exp:
+            finfo = FileInfo(filepath, rpath, base_dir, isdir, False, True)
+            fc(finfo, depth, exp)
+            return
+        if len(files)==0:
+            finfo = FileInfo(filepath, rpath, base_dir, isdir, True, True)
+            fc(finfo, depth)
+        files = [
+            [
+                os.path.join(filepath, file),
+                os.path.join(rpath, file)
+            ]
+            for file in files]
+        [dirs(fp[0], fc, depth+1, base_dir, fp[1]) for fp in files]
+
+pass
+

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

@@ -34,12 +34,23 @@ def fwrites(cts, fp, mode = 'wb'):
 pass
 writes = fwrites
 
-def makefdir(fp):
-    fp = os.path.abspath(fp)
-    dp = os.path.dirname(fp)
+def makedir(dp):
     if os.path.isdir(dp):
         return
     os.makedirs(dp)
 
+pass
+def makefdir(fp):
+    fp = os.path.abspath(fp)
+    dp = os.path.dirname(fp)
+    makedir(dp)
+
 pass
 
+def dirpath(fp, n=1):
+    for i in range(n):
+        fp = os.path.dirname(fp)
+    return fp
+
+pass
+dirname = dirpath

buildz-0.5.7/buildz/fz/lsf.py

@@ -0,0 +1,113 @@
+#coding=utf-8
+
+from . import dirz
+
+import re
+class ListsDeal(dirz.FileDeal):
+    def result(self):
+        return self.fps, self.errors
+    def init(self):
+        super().init()
+        self.fps = []
+        self.errors = []
+    def visit(self, finfo, depth):
+        fp, isdir = finfo.path, finfo.isdir
+        self.fps.append([fp, isdir])
+        return True
+    def catch(self, finfo, depth, exp):
+        fp, isdir = finfo.path, finfo.isdir
+        self.errors.append([fp, isdir, exp])
+
+pass
+
+class SearchDeal(dirz.FileDeal):
+    def init(self, pt_fp=None, pt = None, pt_dp = None, depth = None, relative = False):
+        super().init()
+        self.pt_fp = pt_fp
+        self.pt_dp = pt_dp
+        if type(pt) == str:
+            pt = pt.encode()
+        self.pt = pt
+        self.rst = []
+        self.errs = []
+        self.depth = depth
+        self.relative = relative
+    def fps(self, keep_dir = False, relative = None, fp_only = True):
+        if relative is None:
+            relative = self.relative
+        rst = self.rst
+        if relative:
+            rst = [[i.rpath, i.isdir] for i in rst]
+        else:
+            rst = [[i.path, i.isdir] for i in rst]
+        if not keep_dir:
+            rst = [k for k in rst if not k[1]]
+        if fp_only:
+            rst = [k[0] for k in rst]
+        return rst
+    def result(self):
+        return self.rst
+    def visit(self, finfo, depth):
+        if self.depth is not None and depth > self.depth:
+            return False
+        filepath = finfo.path
+        isdir = finfo.isdir
+        if self.relative:
+            filepath = finfo.rpath
+        if isdir:
+            if finfo.empty_dir or depth==self.depth:
+                if self.pt_dp is not None and len(re.findall(self.pt_dp, filepath))==0:
+                    return True
+                self.rst.append(finfo)
+            return True
+        if self.pt_fp is not None and len(re.findall(self.pt_fp, filepath))==0:
+            return False
+        if self.pt is not None:
+            try:
+                with open(filepath, 'rb') as f:
+                    s = f.read()
+            except Exception as exp:
+                self.catch(finfo, depth, exp)
+                return False
+            if len(re.findall(self.pt, s))==0:
+                return False
+        self.rst.append(finfo)
+        return False
+    def catch(self, finfo, depth, exp):
+        filepath = finfo.path
+        if self.relative:
+            filepath = finfo.rpath
+        print(f"exp in {finfo}: {exp}")
+        self.errs.append([finfo, exp])
+        pass
+
+pass
+
+def lists(fp):
+    return ListsDeal().dirs(fp)
+
+pass
+def _search(dp, pt_fp = None, pt = None, pt_dp = None, depth=None, relative = False):
+    deal = SearchDeal(pt_fp, pt, pt_dp, depth,relative)
+    return deal.dirs(dp)
+
+pass
+def searchs(dp, pt_fp = None, pt = None, pt_dp = None, depth=None, relative = False):
+    deal = SearchDeal(pt_fp, pt, pt_dp, depth,relative)
+    deal.dirs(dp)
+    return deal.fps(keep_dir=True, fp_only=False)
+
+pass
+def searchd(dp, pt_fp = None, pt = None, pt_dp = None, depth=None, relative = False):
+    deal = SearchDeal(pt_fp, pt, pt_dp, depth,relative)
+    deal.dirs(dp)
+    return deal.fps(keep_dir=True, fp_only=True)
+
+pass
+
+def search(dp, pt_fp = None, pt = None, depth=None, relative = False):
+    deal = SearchDeal(pt_fp, pt, None, depth,relative)
+    deal.dirs(dp)
+    return deal.fps(keep_dir=False, fp_only=True)
+
+pass

buildz-0.5.7/buildz/ioc/base.py

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

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc/base.py

@@ -37,17 +37,21 @@ class EncapeData(Base):
             info: 额外的调用信息，目前只有object会用到里面的id字段，作为单例额外输入
         """
         if typez(data)==dict:
-            pid = xf.g(data, parent=None)
+            pid = xf.g1(data, parent=None)
             if pid is not None:
-                pedt = conf.get_data(pid, local=True, search_confs = True,src = src, info = info)
-                if pedt is None:
-                    raise IOCError("unfind parend: "+pid)
-                pdt = pedt.data
-                if typez(pdt)!=dict:
-                    raise IOCError("only dict can be a parent: "+pid)
                 data = dict(data)
-                self.update_maps(data, pdt, replace=0)
                 del data['parent']
+                pids = pid
+                if typez(pids)!=list:
+                    pids = [pid]
+                for pid in pids:
+                    pedt = conf.get_data(pid, local=True, search_confs = True,src = src, info = info)
+                    if pedt is None:
+                        raise IOCError("unfind parend: "+pid)
+                    pdt = pedt.data
+                    if typez(pdt)!=dict:
+                        raise IOCError("only dict can be a parent: "+pid)
+                    self.update_maps(data, pdt, replace=0)
         self.data = data
         self.sid = conf.id
         self.src = src

buildz-0.5.7/buildz/ioc/ioc/single.py

@@ -0,0 +1,56 @@
+#coding=utf-8
+from .base import Base, EncapeData,IOCError
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+
+class Single(Base):
+    """
+        virtual deal
+        {
+            single=1/0
+            info: {
+                cid: ??
+            }
+        }
+    """
+    def init(self, single="single", cid = "id", default=1):
+        self.k_cid = cid
+        self.k_single = single
+        self.default = default
+        self.singles = {}
+    def get_ids(self, edata: EncapeData):
+        sid = edata.sid
+        data = edata.data
+        info = edata.info
+        if type(info) == dict:
+            cid = xf.get(info, self.cid, None)
+        else:
+            cid = None
+        id = xf.g(data, id = None)
+        single = xf.get(data, self.k_single, None)
+        if id is None:
+            single = 0
+        if single is None:
+            single = self.default
+        ids = None
+        if single or cid is not None:
+            if cid is not None:
+                ids = [sid, 'local_id', id, cid]
+            else:
+                ids = [sid, 'single', id]
+        return ids
+    def get(self, edata:EncapeData):
+        ids = self.get_ids(edata)
+        if ids is None:
+            return None
+        obj = xf.gets(self.singles, ids)
+        return obj
+    def set(self, obj, edata:EncapeData):
+        ids = self.get_ids(edata)
+        if ids is None:
+            return
+        xf.sets(self.singles, ids, obj)
+
+pass

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc_deal/calls.py

@@ -35,7 +35,7 @@ class CallsDeal(FormatDeal):
         conf = edata.conf
         data = self.format(data)
         src = edata.src
-        calls = xf.g(data, calls=[])
+        calls = xf.g1(data, calls=[], data = [])
         rst = None
         for call in calls:
             rst = self.get_obj(call, conf, src)

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc_deal/env.py

@@ -25,7 +25,7 @@ class EnvDeal(FormatDeal):
     def deal(self, edata:EncapeData):
         data = edata.data
         data = self.fill(data)
-        key = data['key']
+        key = xf.get_first(data, 'env', 'key')
         val = edata.conf.get_env(key)
         default = xf.g(data, default=None)
         if val is None and default is not None:

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc_deal/ioc.py

@@ -25,7 +25,7 @@ class IOCObjectDeal(FormatDeal):
     def deal(self, edata:EncapeData):
         data = edata.data
         data = self.fill(data)
-        key = data['key']
+        key = xf.get_first(data, 'ioc', 'key')
         if not hasattr(edata, key):
             return None
         return getattr(edata, key)

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc_deal/join.py

@@ -24,7 +24,7 @@ class JoinDeal(FormatDeal):
     def deal(self, edata:EncapeData):
         data = edata.data
         data = self.fill(data)
-        lists = xf.g(data, data=[])
+        lists = xf.g1(data, join = [], data=[])
         conf = edata.conf
         rst = [self.get_obj(k, conf, edata.src, edata.info) for k in lists]
         return join(*rst)

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc_deal/list.py

@@ -27,7 +27,7 @@ class ListDeal(FormatDeal):
     def deal(self, edata:EncapeData):
         data = edata.data
         data = self.fill(data)
-        lists = xf.g(data, data=[])
+        lists = xf.g1(data, list = [], data=[])
         conf = edata.conf
         rst = [self.get_obj(k, conf, edata.src, edata.info) for k in lists]
         return rst

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

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

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

@@ -136,12 +136,17 @@ class ObjectDeal(FormatDeal):
             # TODO: 这边info透传好像会有问题
             self.get_obj(prev_call, conf, obj, edata.info)
         sets = xf.g(data, sets=[])
-        for kv in sets:
-            kv = self.fmt_set(kv)
-            k = kv['key']
-            v = kv['data']
-            v = self.get_obj(v, conf, obj, edata.info)
-            setattr(obj, k, v)
+        if type(sets)==list:
+            for kv in sets:
+                kv = self.fmt_set(kv)
+                k = kv['key']
+                v = xf.get_first(kv, "val", "data")
+                v = self.get_obj(v, conf, obj, edata.info)
+                setattr(obj, k, v)
+        else:
+            for k,v in sets.items():
+                v = self.get_obj(v, conf, obj, edata.info)
+                setattr(obj, k, v)
         call = xf.g(data, call=None)
         if call is not None:
             self.get_obj(call, conf, obj, edata.info)

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

@@ -26,7 +26,7 @@ class RefDeal(FormatDeal):
     def deal(self, edata:EncapeData):
         data = edata.data
         data = self.fill(data)
-        key = data['key']
+        key = xf.get_first(data, 'ref', 'key')
         info = xf.g(data, info=None)
         if info is not None and type(info)==dict:
             #info = {k:self.get_obj(info, edata.conf, src = edata.src) for k in info}

{buildz-0.5.5 → buildz-0.5.7}/buildz/ioc/ioc_deal/val.py

@@ -1,6 +1,6 @@
 #
 from ..ioc.base import Base, EncapeData
-
+from buildz import xf
 class ValDeal(Base):
     """
         数据val:
@@ -24,6 +24,6 @@ class ValDeal(Base):
         data = edata.data
         if type(data)==list:
             return data[-1]
-        return data['data']
+        return xf.get_first(data, "val", "data")
 
 pass

{buildz-0.5.5 → buildz-0.5.7}/buildz/xf/loaderz/deal/lrval.py

@@ -32,9 +32,11 @@ class LRValDeal(lr.LRDeal):
             rst.append(_item.val)
         try:
             val = self.fc(rst[0], rst[1])
-        except Exception as exp1:
+        except Exceptin as exp1:
             print("exp:", exp1)
             raise Exception(f"error in lrval fc: {self.fc}({rst}): {exp1} ")
         return item.Item(val, type='val', is_val = 1)
+    def build_arr(self, obj):
+        return self.build(obj)
 
 pass

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

@@ -38,6 +38,30 @@ def gf(obj, **maps):
         rst = rst[0]
     return rst
 
+pass
+def get_first(obj, *keys):
+    for k in keys:
+        if k in obj:
+            return obj[k]
+    raise KeyError(keys[0])
+
+pass
+def get_one(obj, keys, default = None):
+    for k in keys:
+        if k in obj:
+            return obj[k]
+    return default
+
+pass
+def g1(obj, **maps):
+    v = None
+    for k in maps:
+        v = maps[k]
+        if k in obj:
+            v = obj[k]
+            return v
+    return v
+
 pass
 def g(obj, **maps):
     rst = []

{buildz-0.5.5 → buildz-0.5.7/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.5
+Version: 0.5.7
 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

{buildz-0.5.5 → buildz-0.5.7}/buildz.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ buildz/ioc/init.py
 buildz/ioc/ioc/base.py
 buildz/ioc/ioc/conf.py
 buildz/ioc/ioc/confs.py
+buildz/ioc/ioc/single.py
 buildz/ioc/ioc_deal/base.py
 buildz/ioc/ioc_deal/call.py
 buildz/ioc/ioc_deal/calls.py

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

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

buildz-0.5.5/buildz/fz/dirz.py

@@ -1,46 +0,0 @@
-#coding=utf-8
-import os
-#列出文件夹下所有文件和文件更新时间
-#文件访问处理方法
-#建议visit读取文件
-#catch处理目录访问异常
-class FileDeal:
-    def __init__(self, *argv, **maps):
-        self.init(*argv, **maps)
-    def result(self):
-        return None
-    def init(self, *argv, **maps):
-        pass
-    def work(self, *argv, **maps):
-        return self.dirs(*argv, **maps)
-    def dirs(self, filepath, depth = 0):
-        dirs(filepath, self, depth)
-        return self.result()
-    def visit(self, filepath, isdir, depth):
-        return True
-    def catch(self, filepath, isdir, depth, exp):
-        pass
-    def deal(self, filepath, isdir, depth, exp = None):
-        if exp is None:
-            return self.visit(filepath, isdir, depth)
-        else:
-            return self.catch(filepath, isdir, depth, exp)
-    def __call__(self, *argv, **maps):
-        return self.deal(*argv, **maps)
-
-pass
-#遍历文件／文件夹filepath
-def dirs(filepath, fc=FileDeal(), depth = 0):
-    isdir = os.path.isdir(filepath)
-    visit = fc(filepath, isdir, depth)
-    if isdir and visit:
-        try:
-            files = os.listdir(filepath)
-        except Exception as exp:
-            fc(filepath, isdir, depth, exp)
-            return
-        files = [os.path.join(filepath, file) for file in files]
-        [dirs(fp, fc, depth+1) for fp in files]
-
-pass
-

buildz-0.5.5/buildz/fz/lsf.py

@@ -1,65 +0,0 @@
-#coding=utf-8
-
-from . import dirz
-
-import re
-class ListsDeal(dirz.FileDeal):
-    def result(self):
-        return self.fps, self.errors
-    def init(self):
-        super().init()
-        self.fps = []
-        self.errors = []
-    def visit(self, fp, isdir, depth):
-        self.fps.append([fp, isdir])
-        return True
-    def catch(self, fp, isdir, depth, exp):
-        self.errors.append([fp, isdir, exp])
-
-pass
-
-class FileSearchDeal(dirz.FileDeal):
-    def init(self, pt_fp=None, pt = None, depth = None):
-        super().init()
-        self.pt_fp = pt_fp
-        if type(pt) == str:
-            pt = pt.encode()
-        self.pt = pt
-        self.rst = []
-        self.depth = depth
-    def result(self):
-        return self.rst
-    def visit(self, filepath, isdir, depth):
-        if self.depth is not None and depth > self.depth:
-            return False
-        if isdir:
-            return True
-        if self.pt_fp is not None and len(re.findall(self.pt_fp, filepath))==0:
-            return False
-        if self.pt is not None:
-            try:
-                with open(filepath, 'rb') as f:
-                    s = f.read()
-            except Exception as exp:
-                print("fread exp in :", filepath, "exp:", exp)
-                return False
-            if len(re.findall(self.pt, s))==0:
-                return False
-        #print("find:", filepath)
-        self.rst.append(filepath)
-        return False
-    def catch(self, filepath, isdir, depth, exp):
-        print(f"exp in {filepath} isdir={isdir}: {exp}")
-        pass
-
-pass
-
-
-def lists(fp):
-    return ListsDeal().dirs(fp)
-
-pass
-def search(dp, pt_fp = None, pt = None, depth = None):
-    return FileSearchDeal(pt_fp, pt, depth).dirs(dp)
-
-pass

buildz-0.5.5/buildz/ioc/base.py

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