buildz 0.6.5__tar.gz → 0.6.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.5
+Version: 0.6.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), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.5 → buildz-0.6.7}/buildz/__init__.py

@@ -5,4 +5,5 @@ __version__="0.4.91"
 # 小号多
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"
 
-from .argx import fetch as args
+from .argx import fetch as args
+from .base import Base

buildz-0.6.7/buildz/base.py

@@ -0,0 +1,21 @@
+#coding=utf-8
+
+class Base:
+    def str(self):
+        return str(self.__class__)
+    def __str__(self):
+        return self.str()
+    def __repr__(self):
+        return self.__str__()
+    def __init__(self, *args, **maps):
+        self.init(*args, **maps)
+    def __call__(self, *args, **maps):
+        return self.call(*args, **maps)
+    def init(self, *args, **maps):
+        pass
+    def call(self, *args, **maps):
+        return self.deal(*args, **maps)
+    def deal(self, *args, **maps):
+        return None
+
+pass

{buildz-0.6.5 → buildz-0.6.7}/buildz/fz/__init__.py

@@ -3,6 +3,6 @@
 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
-from .fhs import fhash
+from .fhs import fhash, fhashs
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

buildz-0.6.7/buildz/fz/fhs.py

@@ -0,0 +1,55 @@
+#coding=utf-8
+
+import hashlib
+import os
+#计算文件hash值
+def fhash(fp, hm="sha256", blk_sz = 10240):
+	if type(hm) == str:
+		hm = getattr(hashlib, hm)()
+	with open(fp, 'rb') as f:
+		while True:
+			bs = f.read(blk_sz)
+			if len(bs)==0:
+				break
+			hm.update(bs)
+	return hm.hexdigest()
+
+pass
+def bs_hash(bs, fhm):
+	obj = fhm()
+	obj.update(bs)
+	return obj.hexdigest()
+
+pass
+def fhashs(fp, blk_size = 10240, max_read = -1, hm = "sha256"):
+	if type(hm) == str:
+		fhm = getattr(hashlib, hm)
+	else:
+		fhm = hm
+	hashs = []
+	if not os.path.isfile(fp) or max_read==0:
+		return hashs
+	size = 0
+	bs = b""
+	reads = 0
+	mark_read = True
+	with open(fp, 'rb') as f:
+		while len(bs)>0 or mark_read:
+			if max_read>0 and size>=max_read:
+				break
+			read_size = blk_size
+			if max_read>0:
+				read_size = min(max_read-size, blk_size)
+			if mark_read:
+				curr = f.read(read_size)
+				if len(curr)==0:
+					mark_read = False
+				else:
+					bs += curr
+			if len(bs)>=read_size or not mark_read:
+				tmp = bs[:read_size]
+				bs = bs[read_size:]
+				size+=read_size
+				hashs.append(bs_hash(tmp, fhm))
+	return hashs
+	

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc/base.py

@@ -9,6 +9,8 @@ class IOCError(Exception):
         super().__init__(msg)
 
 pass
+class IdNotFoundError(IOCError):
+    pass
 class Base:
     def update_maps(self, maps, src, replace=1):
         xf.deep_update(maps, src, replace)

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

@@ -2,7 +2,7 @@
 from buildz import xf, pyz
 from buildz.xf import g as xg
 import json
-from .base import Base, EncapeData,IOCError
+from .base import Base, EncapeData,IOCError, IdNotFoundError
 from builtins import id as _id
 class Conf(Base):
     """
@@ -198,7 +198,7 @@ class Conf(Base):
         else:
             conf = self.get_data(id, src = src, info = info)
         if conf is None:
-            raise IOCError(f"can't find conf of {id}")
+            raise IdNotFoundError(f"can't find conf of {id}")
             return None
         deal = self.get_deal(conf.type)
         if deal is None:

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

@@ -3,7 +3,7 @@ from buildz import xf, pyz
 from buildz.xf import g as xg
 from buildz import argx
 import json
-from .base import Base, EncapeData,IOCError
+from .base import Base, EncapeData,IOCError, IdNotFoundError
 from .conf import Conf
 import os
 class ConfsNode(Base):
@@ -237,6 +237,13 @@ class Confs(Base):
         if not self.has_var(key):
             return None, False
         return self.vars[key][i], True
+    def push_vars(self, vars):
+        if vars is not None:
+            [self.push_var(key,val) for key,val in vars.items()]
+        return pyz.with_out(lambda :self.pop_vars(vars))
+    def pop_vars(self, vars):
+        if vars is not None:
+            [self.pop_var(key) for key in vars]
     def push_var(self, key, val):
         if key not in self.vars:
             self.vars[key] =  []
@@ -331,7 +338,8 @@ class Confs(Base):
         if type(conf) in [bytes, str]:
             conf = self.loads(conf)
         obj = Conf(conf, self)
-        id = xf.g1(conf, id=None, namespace=None)
+        id = obj.namespace
+        #id = xf.g1(conf, id=None, namespace=None)
         ids = self.ids(id)
         node = self.node
         for id in ids:
@@ -358,7 +366,7 @@ class Confs(Base):
         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}")
+            raise IdNotFoundError(f"confs: can't find conf of {id}")
             return None
         deal = self.get_deal(conf.type, sid)
         if deal is None:

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

@@ -25,7 +25,7 @@ class Single(Base):
         data = edata.data
         info = edata.info
         if type(info) == dict:
-            cid = xf.get(info, self.cid, None)
+            cid = xf.get(info, self.k_cid, None)
         else:
             cid = None
         id = xf.g(data, id = None)
@@ -52,5 +52,10 @@ class Single(Base):
         if ids is None:
             return
         xf.sets(self.singles, ids, obj)
+    def remove(self,edata:EncapeData):
+        ids = self.get_ids(edata)
+        if ids is None:
+            return
+        xf.removes(self.singles, ids)
 
 pass

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/base.py

@@ -96,8 +96,9 @@ class FormatData(Base):
                 null = xf.g(obj, nullable=1)
                 if not null:
                     raise Exception(f"error format in {self.name}, not default value for index {i}, key {key}")
-                default = xf.g(obj, default=None)
-                maps[key] = default
+                if "default" in obj:
+                    default = xf.g(obj, default=None)
+                    maps[key] = default
                 cnt +=1
                 continue
             next_conf = xf.g(obj, conf = None)
@@ -138,6 +139,12 @@ class BaseDeal(Base):
         _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
+    def fill_objs(self, data, conf, src = None, info = None):
+        if type(data)==list:
+            data = [get_obj(k, conf, src, info) for k in data]
+        else:
+            data = {k:get_obj(v, conf, src, info) for k,v in data.items()}
+        return data
     def get_obj(self, data, conf, src = None, info = None):
         edata = self.get_data(data, conf, src, info)
         return edata()
@@ -149,10 +156,10 @@ class BaseDeal(Base):
         _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)
+        # deal = conf.get_deal(edata.type)
+        # if deal is None:
+        #     return None
+        # return deal(edata)
     def deal(self, edata:EncapeData):
         """
         """
@@ -190,18 +197,18 @@ class FormatDeal(BaseDeal):
         data = self.format.l2m(data)
         self.format.fill(data)
         return data
-    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 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)
 
 pass

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/call.py

@@ -60,9 +60,9 @@ class CallDeal(FormatDeal):
             xf.fill(imaps, maps, 1)
         # args = [self.get_obj(v, conf, src, info = edata.info) for v in args]
         # maps = {k:self.get_obj(maps[k], conf, src, info = edata.info) for k in maps}
+        self.push_vars(conf, ivars)
         args = [self.get_obj(v, conf, src) for v in args]
         maps = {k:self.get_obj(maps[k], conf, src) for k in maps}
-        self.push_vars(conf, ivars)
         rst = method(*args, **maps)
         self.pop_vars(conf, ivars)
         return rst

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/calls.py

@@ -24,8 +24,6 @@ class CallsDeal(FormatDeal):
         [[main_call, calls], [[call, buildz.pyz.pyexe], [call, buildz.pyz.pypkg]]] 
     """
     def init(self, fp_lists = None, fp_defaults = None):
-        self.singles = {}
-        self.sources = {}
         super().init("CallsDeal", fp_lists, fp_defaults, 
             join(dp, "conf", "calls_lists.js"),
             join(dp, "conf", "calls_defaults.js"))

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/conf/ref_lists.js

@@ -18,6 +18,10 @@
             nullable: 0,
             key: key
         },
+        {
+            nullable:1
+            key:default
+        }
         {
             nullable: 1,
             key: info

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/deal.py

@@ -67,6 +67,7 @@ class DealDeal(FormatDeal):
         super().init("DealDeal", fp_lists, fp_defaults, join(dp, "conf", "deal_lists.js"), None)
     def deal(self, edata:EncapeData):
         data = edata.data
+        data = self.fill(data)
         source = xf.g(data, source=None)
         if source is None:
             raise IOCError("not source in dealdeal")

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/iocf.py

@@ -53,7 +53,7 @@ class IOCFObjectDeal(FormatDeal):
         if len(fps)==0:
             return None
         edata.conf.confs.add_fps(fps)
-        self.fps.update(fp)
+        self.fps.update(fps)
         return None
 
 pass

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/mcall.py

@@ -62,7 +62,7 @@ class MethodCallDeal(FormatDeal):
         iargs, imaps = None, None
         ivars = None
         if type(info) == dict:
-            iargs, imaps = xf.g(info, m_args = None, m_maps = None, vars=None)
+            iargs, imaps, ivars = xf.g(info, m_args = None, m_maps = None, vars=None)
         args = xf.g(data, args=[])
         maps = xf.g(data, maps ={})
         vars = xf.g(data, vars={})
@@ -76,9 +76,9 @@ class MethodCallDeal(FormatDeal):
             xf.fill(imaps, maps, 1)
         # args = [self.get_obj(v, conf, src, edata.info) for v in args]
         # maps = {k:self.get_obj(maps[k], conf, src, edata.info) for k in maps}
+        self.push_vars(conf, ivars)
         args = [self.get_obj(v, conf, src) for v in args]
         maps = {k:self.get_obj(maps[k], conf, src) for k in maps}
-        self.push_vars(conf, ivars)
         rst = method(*args, **maps)
         self.pop_vars(conf, ivars)
         return rst

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

@@ -96,6 +96,8 @@ class ObjectDeal(FormatDeal):
             cid = xf.g(info, id=None)
             iargs, imaps = xf.g(info, args = None, maps = None)
             icst = {'args':iargs, 'maps':imaps}
+            if iargs is None and imaps is None:
+                icst = None
             isets = xf.g(info, sets = None)
             ivars = xf.g(info, vars=None)
         else:
@@ -141,10 +143,11 @@ class ObjectDeal(FormatDeal):
         if icst is not None:
             xf.fill(icst, cst, 1)
         args = xf.g(cst, args=[])
+        args = xf.im2l(args)
         maps = xf.g(cst, maps={})
+        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}
-        self.push_vars(conf, ivars)
         obj = fc(*args, **maps)
         if ids is not None:
             xf.sets(self.singles, ids, obj)

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/ovar.py

@@ -34,7 +34,7 @@ class ObjectVarDeal(FormatDeal):
         src = edata.src
         source = xf.g1(data, source=None, src=None)
         #key = xf.g(data, key=0)
-        key = xf.get_first(data, "ovar", "key")
+        key = xf.get_first(data, "ovar", "key", "data")
         info = xf.g(data, info=None)
         if info is not None:
             info = self.get_obj(info, src = edata.src, info = edata.info)

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/ref.py

@@ -1,5 +1,5 @@
 #coding=utf-8
-from ..ioc.base import Base, EncapeData
+from ..ioc.base import Base, EncapeData, IdNotFoundError
 from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 import os
@@ -31,10 +31,20 @@ class RefDeal(FormatDeal):
         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) 
+            info = self.get_obj(info, edata.conf, src = edata.src)
+        else:
+            info = {}
+        _info = edata.info
+        if type(_info)==dict:
+            xf.deep_update(info, _info, 1)
         var, exist = edata.conf.get_var(key)
         if exist:
             return var
-        return edata.conf.get_obj(key, info = info, src = edata.src)
+        try:
+            return edata.conf.get_obj(key, info = info, src = edata.src)
+        except IdNotFoundError as exp:
+            if "default" in data:
+                return data['default']
+            raise exp
 
 pass

{buildz-0.6.5 → buildz-0.6.7}/buildz/ioc/ioc_deal/var.py

@@ -30,7 +30,7 @@ class VarDeal(FormatDeal):
         conf = edata.conf
         data = self.format(data)
         src = edata.src
-        key = xf.get_first(data, "var", "data")
+        key = xf.get_first(data, "var", "key", "data")
         key = pyz.load(key)
         return key
 

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

@@ -2,6 +2,29 @@
 import sys
 import os
 import hashlib
+class With:
+    def __init__(self, fc_in, fc_out, args = False):
+        self.fc_in = fc_in
+        self.fc_out = fc_out
+        self.args = args
+    def __enter__(self):
+        if self.fc_in is not None:
+            self.fc_in()
+        return self
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        rst = False
+        if self.fc_out is not None:
+            if self.args:
+                rst = self.fc_out(exc_type, exc_val, exc_tb)
+            else:
+                rst = self.fc_out()
+        return rst
+
+pass
+def with_out(fc, args = False):
+    return With(None, fc, args)
+
+pass
 def hashcode(s):
     if type(s)==str:
         s = s.encode("utf-8")
@@ -10,7 +33,7 @@ def hashcode(s):
 pass
 def test_current(fp, up = 1, adds = []):
     """
-        将当前目录的上{up}层目录加入sys.path，这样可以在同层写测试代码，但是import还是要当在上{up}层做import
+        将当前目录的上{up}层目录加入sys.path，这样可以在同层写测试代码，但是写import的时候还是要当作是在上{up}层做import
     """
     if type(adds) not in [list, tuple]:
         adds = [adds]
@@ -22,6 +45,8 @@ def test_current(fp, up = 1, adds = []):
 
 pass
 add_path = test_current
+add_current = test_current
+add = test_current
 def load(md, fc = None):
     """
         import object(whether module or others) from md(or md.fc)

{buildz-0.6.5 → buildz-0.6.7}/buildz/xf/mapz.py

@@ -105,6 +105,23 @@ def fill_fc(maps, fc):
     return maps
 
 pass
+def im2l(maps):
+    if type(maps)!=dict:
+        return maps
+    mx = 0
+    for k in maps:
+        if type(k)==str:
+            k = int(k)
+        if type(k)!=int or k<0:
+            raise Exception(f"args key only can be int and bigger than 0, but {type(k)}:{k} found")
+        mx = max(k+1, mx)
+    arr = [None]*mx
+    for k, v in maps.items():
+        arr[k] = v
+    return arr
+
+pass
+    
 def sets(maps, keys, val):
     if type(keys) != list:
         keys = [keys]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.5
+Version: 0.6.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), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.5 → buildz-0.6.7}/buildz.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ setup.py
 buildz/__init__.py
 buildz/__main__.py
 buildz/argx.py
+buildz/base.py
 buildz/cmd.py
 buildz/pyz.py
 buildz.egg-info/PKG-INFO

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

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

buildz-0.6.5/buildz/fz/fhs.py

@@ -1,17 +0,0 @@
-#coding=utf-8
-
-import hashlib
-
-#计算文件hash值
-def fhash(fp, hm="sha256", blk_sz = 10240):
-	if type(hm) == str:
-		hm = getattr(hashlib, hm)()
-	with open(fp, 'rb') as f:
-		while True:
-			bs = f.read(blk_sz)
-			if len(bs)==0:
-				break
-			hm.update(bs)
-	return hm.hexdigest()
-
-pass