buildz 0.5.9__tar.gz → 0.5.91__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.9
+Version: 0.5.91
 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.9 → buildz-0.5.91}/buildz/demo/res/help/search.js

@@ -12,6 +12,12 @@ r"""
         --output=输出文件
         -d 最深路径
         --depth=最深路径
+        -s/+s 展示内容查询
+        -p 展示查询内容前多少字
+        --prev=展示查询内容前多少字
+        -a 展示查询内容前多少字
+        --aft=展示查询内容后多少字
+        
 
 比如:
     python -m buildz search {default} -f ".*\.js" -c "ioc" -d 3

{buildz-0.5.9 → buildz-0.5.91}/buildz/demo/search/deal.py

@@ -12,9 +12,13 @@ class Deal:
         ct = argx.get(maps, "c,content".split(","), None)
         depth = argx.get(maps, "d,depth".split(","), None)
         out_fp = argx.get(maps, "o,output".split(","), None)
+        show = argx.get(maps, "s,show".split(","), False)
+        prv = int(argx.get(maps, "p,prev".split(","), 10))
+        aft = int(argx.get(maps, "a,aft".split(","), 10))
+        shows = [prv, aft]
         if depth is not None:
             depth = int(depth)
-        rst = fz.search(dp, ct_fp, ct, depth)
+        rst = fz.search(dp, ct_fp, ct, depth, show=show, shows=shows)
         l = len(rst)
         rs = "\n".join(rst)
         if out_fp is not None:

buildz-0.5.91/buildz/fz/lsf.py

@@ -0,0 +1,192 @@
+#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
+
+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
+g_codes = ["utf-8", "gbk"]
+class SearchDeal(dirz.FileDeal):
+    def init(self, pt_fp=None, pt = None, pt_dp = None, depth = None, relative = False, show_ct = False, shows = [10,10]):
+        super().init()
+        self.pt_fp = pt_fp
+        self.pt_dp = pt_dp
+        #if type(pt) == str:
+        #    pt = pt.encode()
+        if pt is not None:
+            pfx = f"([\s\S]{{0,{shows[0]}}}"
+            sfx = f"[\s\S]{{0,{shows[1]}}})"
+            if type(pt)==bytes:
+                pfx = pfx.encode()
+                sfx = sfx.encode()
+            pt = pfx+pt+sfx
+        global g_codes
+        if pt is not None:
+            if type(pt) == str:
+                pts = [pt.encode(c) for c in g_codes]
+            else:
+                pts = [pt]
+        else:
+            pts = None
+        self.pts = pts
+        self.pt = pt
+        self.rst = []
+        self.errs = []
+        self.depth = depth
+        self.relative = relative
+        self.show_ct = show_ct
+        self.show_list = []
+    def fps(self, keep_dir = False, relative = None, fp_only = True):
+        if self.show_ct:
+            return self.show_list
+        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):
+        if self.show_ct:
+            return self.show_list
+        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
+            pt = self.pt
+            mark = False
+            finds = None
+            mark = -1
+            for i in range(len(self.pts)):
+                pt = self.pts[i]
+                finds = re.findall(pt, s)
+                if len(finds)>0:
+                    mark = i
+                    break
+            if mark<0:
+                return False
+            if self.show_ct:
+                arr = []
+                code = g_codes[mark]
+                bld = b"* "*32
+                blda = b"- "*32
+                bldi = b".."*32
+                arr.append(bld)
+                arr.append(f"filepath: {filepath}, find {len(finds)}:".encode("utf-8"))
+                arr.append(bldi)
+                if type(self.pt)==bytes:
+                    pass
+                else:
+                    try:
+                        s = s.decode(code)
+                        pt = self.pts[mark].decode(code)
+                        finds = re.findall(pt, s)
+                    except Exception as exp:
+                        print(f"error in decode {filepath}, {pts[mark]} with '{code}': {exp}")
+                for bs_find in finds:
+                    if type(bs_find)==[list, tuple]:
+                        bs_find = bs_find[0]
+                    if type(self.pt)==str:
+                        bs_find = bs_find.encode(code)
+                    #bs_find = b">>>>>>>\n"+bs_find+b"\n<<<<<<\n"
+                    #bs_find += b"\n"+bld+b"\n"
+                    arr.append(bs_find)
+                    arr.append(bldi)
+                arr.append(blda)
+                arr.append(b"")
+                arr = b"\n".join(arr)
+                try:
+                    arr = decode(arr)
+                except Exception as exp:
+                    arr = filepath
+                self.show_list.append(arr)
+        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, show = False, shows = [10,10]):
+    deal = SearchDeal(pt_fp, pt, pt_dp, depth,relative, show, shows)
+    return deal.dirs(dp)
+
+pass
+def searchs(dp, pt_fp = None, pt = None, pt_dp = None, depth=None, relative = False, show = False, shows = [10,10]):
+    deal = SearchDeal(pt_fp, pt, pt_dp, depth,relative, show, shows)
+    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, show = False, shows = [10,10]):
+    deal = SearchDeal(pt_fp, pt, pt_dp, depth,relative, show, shows)
+    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, show = False, shows = [10,10]):
+    deal = SearchDeal(pt_fp, pt, None, depth,relative, show, shows)
+    deal.dirs(dp)
+    return deal.fps(keep_dir=False, fp_only=True)
+
+pass

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

@@ -320,6 +320,7 @@ class Confs(Base):
         for k in obj.deals:
             self.deals[k] = obj.deals[k]
         self.update_maps(self.envs, obj.envs)
+        self.mark_init = False
     def get(self, *args, **maps):
         return self.get_obj(*args, **maps)
     def remove(self, *a,**b):
@@ -350,6 +351,7 @@ class Confs(Base):
         """
             根据type类型查处理函数deal，sid（配置文件id）不为空并且global_deal=False则先查局部
         """
+        self.do_init()
         if sid is not None and not self.global_deal:
             deal = self.confs[sid].get_deal(type, False)
             if deal is not None:

{buildz-0.5.9 → buildz-0.5.91}/buildz/ioc/ioc_deal/obj.py

@@ -90,8 +90,13 @@ class ObjectDeal(FormatDeal):
         info = edata.info
         conf = edata.conf
         confs = edata.confs
+        icst = None
+        isets = None
         if type(info) == dict:
             cid = xf.g(info, id=None)
+            iargs, imaps = xf.g(info, args = None, maps = None)
+            icst = {'args':iargs, 'maps':imaps}
+            isets = xf.g(info, sets = None)
         else:
             cid = None
         id = xf.g(data, id = None)
@@ -105,6 +110,8 @@ class ObjectDeal(FormatDeal):
             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]
         if ids is not None:
             obj = xf.gets(self.singles, ids)
@@ -124,6 +131,8 @@ class ObjectDeal(FormatDeal):
             _maps = xf.g(data, maps = {})
             cst = [_args, _maps]
         cst = self.fmt_cst(cst)
+        if icst is not None:
+            xf.fill(icst, cst, 1)
         args = xf.g(cst, args=[])
         maps = xf.g(cst, maps={})
         args = [self.get_obj(v, conf) for v in args]
@@ -133,20 +142,30 @@ class ObjectDeal(FormatDeal):
             xf.sets(self.singles, ids, obj)
         prev_call = xf.g(data, prev_call=None)
         if prev_call is not None:
-            # TODO: 这边info透传好像会有问题
+            # TODO: 这边info透传不知道会不会有问题
             self.get_obj(prev_call, conf, obj, edata.info)
         sets = xf.g(data, sets=[])
         if type(sets)==list:
+            tmp = {}
             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)
+                tmp[k] = v
+            sets = tmp
+        if type(isets) == list:
+            tmp = {}
+            for kv in isets:
+                kv = self.fmt_set(kv)
+                k = kv['key']
+                v = xf.get_first(kv, "val", "data")
+                tmp[k] = v
+            isets = tmp
+        if isets is not None:
+            xf.fill(isets, sets, 1)
+        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.9 → buildz-0.5.91}/buildz/xf/loaderz/deal/strz.py

@@ -2,7 +2,7 @@ from .. import base
 from .. import item
 from .. import exp
 from ... import file
-import json
+
 from . import lr
 
 def init():
@@ -10,13 +10,12 @@ def init():
     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\\\'\"\?"
+    global special_keys
+    special_keys = [-1]*256
+    s  = "abfnrtv\\'\""
+    ts = b"\a\b\f\n\r\t\v\\\'\""
     for c,t in zip(s, ts):
-        a_map[c2b[c]] = t
+        special_keys[c2b[c]] = t
     symbal_a = [False]*256
     for c in s:
         symbal_a[c2b[c]] = True
@@ -26,9 +25,8 @@ def init():
     id_x = b'x'[0]
 
 pass
-
 init()
-def translate_bts(bts):
+def translate_bts(bts, octs = None, hexs = None):
     i = 0
     rs = []
     while i<len(bts):
@@ -39,30 +37,37 @@ def translate_bts(bts):
             continue
         x0 = bts[i]
         i+=1
-        if symbal_a[x0]:
-            rs.append(a_map[x0])
+        if special_keys[x0]>=0:
+            rs.append(special_keys[x0])
             continue
         v = x0-id_0
         if v>=0 and v<=7:
             tmp = v
+            base=i
             for j in range(2):
-                if i+j+1>=len(bts):
+                if base+j>=len(bts):
                     break
-                xi = bts[i+j+1]
+                xi = bts[base+j]
                 vi = xi-id_0
                 if vi>=0 and vi<=7:
                     i+=1
-                    tmp = (rs<<3)+vi
+                    tmp = (tmp<<3)+vi
                 else:
                     break
-            rs.append(tmp)
+            if octs is not None:
+                #print(f"tmp: '{tmp}', {type(tmp)}")
+                #print(f"ocst: {octs}, {type(octs)}")
+                tmp = octs[tmp]
+            else:
+                tmp = [tmp%256]
+            rs+=tmp
             continue
         if x0 == id_x:
             tmp = 0
             for j in range(2):
-                if i+j+1>=len(bts):
+                if i+j>=len(bts):
                     raise Exception("\\xXX error")
-                xi = bts[i+j+1]
+                xi = bts[i+j]
                 vi = xi-id_0
                 if vi<0 or vi>7:
                     vi = xi-id_a
@@ -70,7 +75,12 @@ def translate_bts(bts):
                         raise Exception("\\xXX error")
                     vi +=10
                 tmp=(tmp<<4)+vi
-            rs.append(tmp)
+            i+=2
+            if hexs is not None:
+                tmp = hexs[tmp]
+            else:
+                tmp = [tmp]
+            rs+=tmp
             continue
         rs.append(c)
         rs.append(x0)
@@ -78,7 +88,23 @@ def translate_bts(bts):
     return bytes(rs)
 
 pass
+def gen_chars(code="utf-8"):
+    simple = "abfnrtv\\'\""
+    octs = [0]*512
+    hexs = [0]*256
+    for i in range(512):
+        if i<256:
+            vhex = hex(i)[2:]
+            if len(vhex)==1:
+                vhex = "0"+vhex
+            cmd = f"'\\x{vhex}'"
+            hexs[i] = list(eval(cmd).encode(code))
+        voct = oct(i)[2:]
+        cmd = f"'\\{voct}'"
+        octs[i] = list(eval(cmd).encode(code))
+    return octs, hexs
 
+pass
 class PrevStrDeal(lr.LRDeal):
     def types(self):
         if not self.deal_build:
@@ -97,6 +123,9 @@ class PrevStrDeal(lr.LRDeal):
         return obj
     def prepare(self, mg):
         super().prepare(mg)
+        self.as_bytes = mg.as_bytes
+        if not self.as_bytes:
+            self.octs,self.hexs = gen_chars()
         self.label_l2 = mg.like("\\")
         self.label_qt = mg.like('"')
         self.label_et = mg.like("\n")
@@ -109,7 +138,11 @@ class PrevStrDeal(lr.LRDeal):
         self.note = note
         self.translate = translate
         self.deal_build = deal_build
+        self.as_bytes = True
+        self.octs = None
+        self.hexs = None
     def json_loads(self, s):
+        import json
         x = s
         cd = None
         if type(x)==bytes:
@@ -119,10 +152,13 @@ class PrevStrDeal(lr.LRDeal):
             rs = rs.encode(cd)
         return rs
     def do_translate(self, s):
+        """
+            取巧用python的eval来生成字符表
+        """
         is_bytes = type(s)==bytes
         if not is_bytes:
             s = s.encode("utf-8")
-        s = translate_bts(s)
+        s = translate_bts(s, self.octs, self.hexs)
         if not is_bytes:
             s = s.decode("utf-8")
         return s

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

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

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

buildz-0.5.9/buildz/fz/lsf.py

@@ -1,113 +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, 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