buildz 0.5.7__tar.gz → 0.5.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.7
+Version: 0.5.9
 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.7 → buildz-0.5.9}/buildz/argx.py

@@ -15,8 +15,24 @@ class Fetch:
     就是对引号不太适用
     """
     def __init__(self, args = [], maps ={}):
+        args = [maps[k] if k in maps else k for k in args]
         self.args = args
         self.maps = maps
+    def des(self):
+        cmd = " ".join(self.args)
+        adds = []
+        for k, val in self.maps.items():
+            tmp = f"    [-{k} param] [--{val}=param]"
+            adds.append(tmp)
+        adds = [cmd]+adds
+        rs = "\n".join(adds)
+        return rs
+    def check(self, args, ks):
+        rst = []
+        for k in ks:
+            if k not in args:
+                rst.append(k)
+        return rst
     def __call__(self, argv = None):
         args, maps = fetch(argv)
         rst = {}
@@ -35,6 +51,11 @@ class Fetch:
                 del rst[key]
         return rst
 
+pass
+class FetchX(Fetch):
+    def __init__(self, *a, **b):
+        super().__init__(a,b)
+
 pass
 def fetch(argv = None):
     r"""

buildz-0.5.9/buildz/cmd.py

@@ -0,0 +1,78 @@
+#coding=utf-8
+from . import xf
+class Cmd:
+    def close(self):
+        self.running = False
+    def __init__(self, obj):
+        self.running = False
+        self.obj = obj
+        self.tmp = None
+        self.exits = "exit,close,quit".split(",")
+    def __call__(self):
+        self.run()
+    def doc(self, *arr):
+        if len(arr)>0:
+            rfc = getattr(self.obj, arr[0])
+        else:
+            rfc = self.obj
+        return rfc.__doc__
+    def help(self, *arr):
+        if len(arr)>0:
+            rfc = getattr(self.obj, arr[0])
+        else:
+            rfc = self.obj
+        help(rfc)
+    def dir(self, *arr):
+        if len(arr)>0:
+            rfc = getattr(self.obj, arr[0])
+        else:
+            rfc = self.obj
+        arr = rfc.__dir__()
+        arr = [k for k in arr if k[:2]!="__"]
+        return arr
+    def dict(self, *arr):
+        if len(arr)>0:
+            rfc = getattr(self.obj, arr[0])
+        else:
+            rfc = self.obj
+        return rfc.__dict__
+    def get(self, *arr):
+        if len(arr)>0:
+            return getattr(self.obj, arr[0])
+        return self.obj
+    def set(self, key, val):
+        setattr(self.obj,key, val)
+        return getattr(self.obj, key)
+    def run(self):
+        self.running = True
+        while self.running:
+            s = input(":").strip()
+            if s.strip()=="":
+                continue
+            if s in self.exits:
+                break
+            try:
+                arr = xf.loads(s)
+                if type(arr)!=list:
+                    if type(arr)==dict:
+                        rst = []
+                        for k,v in arr.items():
+                            rst+=[k,v]
+                        arr = rst
+                    else:
+                        arr = [arr]
+                fc = arr[0]
+                if not hasattr(self.obj, fc):
+                    fc = fc.split(".")[-1]
+                    fc = getattr(self, fc)
+                else:
+                    fc = getattr(self.obj, fc)
+                params = arr[1:]
+                tmp = fc(*params)
+                print(tmp)
+            except Exception as exp:
+                import traceback
+                print(f"[CMD] error:{exp}")
+                traceback.print_exc()
+
+pass

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

@@ -2,6 +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
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover
+from .fhs import fhash
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

buildz-0.5.9/buildz/fz/fhs.py

@@ -0,0 +1,17 @@
+#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

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

@@ -53,4 +53,32 @@ def dirpath(fp, n=1):
     return fp
 
 pass
-dirname = dirpath
+
+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)
+
+pass
+cover = fcover
+def removes(fp, cover = False):
+    if not os.path.exists(fp):
+        return
+    if os.path.isfile(fp):
+        #print(f"remove file '{fp}'")
+        if cover:
+            fcover(fp)
+        os.remove(fp)
+        return
+    fps = os.listdir(fp)
+    fps = [os.path.join(fp, f) for f in fps]
+    [removes(f, cover) for f in fps]
+    #print(f"removedirs '{fp}'")
+    os.rmdir(fp)
+
+pass

{buildz-0.5.7 → buildz-0.5.9}/buildz/ioc/ioc/conf.py

@@ -133,8 +133,19 @@ class Conf(Base):
         if not search_confs:
             return None
         return self.confs.get_deal(type, self.id)
+    def get_data_conf(self, data, src = None, info = None):
+        if type(data) not in [list, dict, tuple]:
+            i = self.confs.data_index_type[0]
+            data = [self.default_type(), data]
+            if i != 0:
+                data.reverse()
+        _type = self.confs.get_data_type(data, 1, self.default_type())
+        edata = EncapeData(data, self, local=True, type=_type, src = src, info = info)
+        return edata
     def get_data(self, id, local = True, search_confs = True, src = None, info = None):
         self.do_init()
+        if type(id) in [list, tuple, dict]:
+            return self.get_data_conf(id, src, info)
         if id in self.datas:
             obj = self.datas[id]
             edata = EncapeData(obj, self, local = False, src=src, info = info)

{buildz-0.5.7 → buildz-0.5.9}/buildz/ioc/ioc/confs.py

@@ -285,7 +285,11 @@ class Confs(Base):
         for fp in fps:
             self.add_fp(fp)
     def add_fp(self, fp):
-        conf = self.loads(xf.fread(fp))
+        try:
+            conf = self.loads(xf.fread(fp))
+        except:
+            print(f'error in loads: {fp}')
+            raise
         return self.add(conf)
     def adds(self, confs):
         for conf in confs:

{buildz-0.5.7 → buildz-0.5.9}/buildz/ioc/ioc_deal/base.py

@@ -123,7 +123,18 @@ class BaseDeal(Base):
         自己实现的处理类，要实现两个方法：__call__(self, edata:EncapeData)和remove(self, edata:EncapeData)
         其中remove可以只写个空方法
     """
+    def get_data(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
     def get_obj(self, data, conf, src = None, info = None):
+        edata = self.get_data(data, conf, src, info)
+        return edata()
         if type(data) not in [list, dict, tuple]:
             i = conf.confs.data_index_type[0]
             data = [conf.default_type(), data]

{buildz-0.5.7 → buildz-0.5.9}/buildz/ioc/ioc_deal/conf/var_lists.js

@@ -13,6 +13,6 @@
     },
     {
         nullable: 0,
-        key: key
+        key: data
     }
 ]

{buildz-0.5.7 → buildz-0.5.9}/buildz/ioc/ioc_deal/var.py

@@ -11,11 +11,11 @@ class VarDeal(FormatDeal):
             {
                 id:id
                 type: var
-                key: string
+                data: string
             }
         简写:
-            [[id, var], key]
-            [var, key]
+            [[id, var], data]
+            [var, data]
         例:
             [var, buildz.pyz.is_windows] // 返回buildz.pyz下的is_windows
     """
@@ -30,7 +30,7 @@ class VarDeal(FormatDeal):
         conf = edata.conf
         data = self.format(data)
         src = edata.src
-        key = xf.g(data, key=0)
+        key = xf.get_first(data, "var", "data")
         key = pyz.load(key)
         return key
 

{buildz-0.5.7 → buildz-0.5.9}/buildz/pyz.py

@@ -1,6 +1,13 @@
 
 import sys
 import os
+import hashlib
+def hashcode(s):
+    if type(s)==str:
+        s = s.encode("utf-8")
+    return hashlib.md5(s).hexdigest()
+
+pass
 def test_current(fp, up = 1):
     """
         将当前目录的上{up}层目录加入sys.path，这样可以在同层写测试代码，但是import还是要当在上{up}层做import

{buildz-0.5.7 → buildz-0.5.9}/buildz/xf/loaderz/deal/listz.py

@@ -13,6 +13,7 @@ class ListDeal(lr.LRDeal):
     def build(self, obj):
         val = obj.val
         if type(val)!=list:
+            return None
             obj.is_val = 1
             return obj
         if len(val)==0:

{buildz-0.5.7 → buildz-0.5.9}/buildz/xf/loaderz/deal/mapz.py

@@ -13,6 +13,7 @@ class MapDeal(lr.LRDeal):
     def build(self, obj):
         val = obj.val
         if type(val)!=list:
+            return None
             obj.is_val = 1
             return obj
         if len(val)==0:

{buildz-0.5.7 → buildz-0.5.9}/buildz/xf/loaderz/deal/nextz.py

@@ -4,8 +4,8 @@ from .. import item
 class PrevNextDeal(base.BaseDeal):
     def labels(self):
         return ['']
-    def types(self):
-        return [""]
+    #def types(self):
+    #    return [""]
     """
         读取下一个字符放缓存里，应放最低优先级
     """
@@ -18,6 +18,7 @@ class PrevNextDeal(base.BaseDeal):
                 return False
             obj = item.Item(rm, type = '', is_val = 0)
             arr.append(obj)
+            # TODO return True?
             return False
         return True
     def build(self, obj):

{buildz-0.5.7 → buildz-0.5.9}/buildz/xf/loaderz/deal/spc.py

@@ -1,6 +1,6 @@
 from .. import base
 
-
+# 未使用
 class PrevSpcDeal(base.BaseDeal):
     """
         去掉左空格

{buildz-0.5.7 → buildz-0.5.9}/buildz/xf/loaderz/deal/strz.py

@@ -4,7 +4,97 @@ from .. import exp
 from ... import file
 import json
 from . import lr
+
+def init():
+    cs = "abfnrtv\\'\"?0123456789xcde"
+    maps = {k:k.encode()[0] for k in cs}
+    global c2b
+    c2b = maps
+    global symbal_a
+    global a_map
+    a_map = [0]*256
+    s  = "abfnrtv\\'\"?"
+    ts = b"\a\b\f\n\r\t\v\\\'\"\?"
+    for c,t in zip(s, ts):
+        a_map[c2b[c]] = t
+    symbal_a = [False]*256
+    for c in s:
+        symbal_a[c2b[c]] = True
+    global id_0,id_a,id_x
+    id_0 = b'0'[0]
+    id_a = b'a'[0]
+    id_x = b'x'[0]
+
+pass
+
+init()
+def translate_bts(bts):
+    i = 0
+    rs = []
+    while i<len(bts):
+        c = bts[i]
+        i+=1
+        if c!=c2b['\\']:
+            rs.append(c)
+            continue
+        x0 = bts[i]
+        i+=1
+        if symbal_a[x0]:
+            rs.append(a_map[x0])
+            continue
+        v = x0-id_0
+        if v>=0 and v<=7:
+            tmp = v
+            for j in range(2):
+                if i+j+1>=len(bts):
+                    break
+                xi = bts[i+j+1]
+                vi = xi-id_0
+                if vi>=0 and vi<=7:
+                    i+=1
+                    tmp = (rs<<3)+vi
+                else:
+                    break
+            rs.append(tmp)
+            continue
+        if x0 == id_x:
+            tmp = 0
+            for j in range(2):
+                if i+j+1>=len(bts):
+                    raise Exception("\\xXX error")
+                xi = bts[i+j+1]
+                vi = xi-id_0
+                if vi<0 or vi>7:
+                    vi = xi-id_a
+                    if vi<0 or vi > 5:
+                        raise Exception("\\xXX error")
+                    vi +=10
+                tmp=(tmp<<4)+vi
+            rs.append(tmp)
+            continue
+        rs.append(c)
+        rs.append(x0)
+        #i-=1
+    return bytes(rs)
+
+pass
+
 class PrevStrDeal(lr.LRDeal):
+    def types(self):
+        if not self.deal_build:
+            return []
+        return ['']
+    def build(self, obj):
+        if type(obj.val)==list:
+            return None
+        if obj.is_val:
+            return obj
+        obj.is_val = 1
+        if self.translate:
+            val = obj.val
+            val = self.do_translate(val)
+            obj.val = val
+        return obj
     def prepare(self, mg):
         super().prepare(mg)
         self.label_l2 = mg.like("\\")
@@ -13,11 +103,12 @@ class PrevStrDeal(lr.LRDeal):
         self.label_lr = mg.like("\r")
         self.label_nl = mg.like("")
         self.et_in_right = self.right.count(self.label_et)
-    def init(self, left = '"', right= '"', single_line = False, note = False, translate = False):
+    def init(self, left = '"', right= '"', single_line = False, note = False, translate = False, deal_build = False):
         super().init(left, right, 'str')
         self.single_line = single_line
         self.note = note
         self.translate = translate
+        self.deal_build = deal_build
     def json_loads(self, s):
         x = s
         cd = None
@@ -28,6 +119,13 @@ class PrevStrDeal(lr.LRDeal):
             rs = rs.encode(cd)
         return rs
     def do_translate(self, s):
+        is_bytes = type(s)==bytes
+        if not is_bytes:
+            s = s.encode("utf-8")
+        s = translate_bts(s)
+        if not is_bytes:
+            s = s.decode("utf-8")
+        return s
         """
             取巧直接调用json
         """
@@ -54,8 +152,6 @@ class PrevStrDeal(lr.LRDeal):
         buffer.clean2read(self.ll)
         if len(rm)>0:
             if not self.note:
-                print("left:", self.left, rm)
-                print(f"rst: [{rst}]")
                 raise Exception(f"unexcept char before string: {rm}")
             else:
                 rst.append(item.Item(rm, type = "", is_val = 0))

buildz-0.5.9/buildz/xf/loaderz/test1.py

@@ -0,0 +1,7 @@
+
+
+from buildz import xf
+a = xf.loads(r'"asdf\n\r\0x"')
+print(a)
+b = xf.loads(r"asdftest\n\r")
+print(b)

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

@@ -94,6 +94,16 @@ def s(obj, **maps):
         v = maps[k]
         obj[k] = v
 
+pass
+def fill_fc(maps, fc):
+    for k in maps:
+        v = maps[k]
+        if type(v) == dict:
+            fill_fc(v, fc)
+            continue
+        maps[k] = fc(v)
+    return maps
+
 pass
 def sets(maps, keys, val):
     if type(keys) != list:
@@ -167,3 +177,8 @@ def deep_update(target, src, replace=1):
 
 pass
 update = deep_update
+def deep_fill(src, target, replace=1):
+    return deep_update(target, src, replace)
+
+pass
+fill=deep_fill

{buildz-0.5.7 → buildz-0.5.9}/buildz/xf/readz.py

@@ -46,9 +46,11 @@ pass
 def build(as_bytes=False):
     mgs = mg.Manager(as_bytes)
     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))
+    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))

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

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

@@ -5,6 +5,7 @@ setup.py
 buildz/__init__.py
 buildz/__main__.py
 buildz/argx.py
+buildz/cmd.py
 buildz/pyz.py
 buildz.egg-info/PKG-INFO
 buildz.egg-info/SOURCES.txt
@@ -32,6 +33,7 @@ buildz/demo/xf/deal.py
 buildz/demo/xf/help.py
 buildz/fz/__init__.py
 buildz/fz/dirz.py
+buildz/fz/fhs.py
 buildz/fz/fio.py
 buildz/fz/lsf.py
 buildz/ioc/__init__.py

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

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

buildz-0.5.7/buildz/xf/loaderz/test1.py

@@ -1,7 +0,0 @@
-
-
-from buildz import xf
-a = xf.loads("1,2,3")
-b = xf.loads("{a=0,b=1}")
-print(a)
-print(b)