buildz 0.4.8__tar.gz → 0.4.91__tar.gz

{buildz-0.4.8/buildz.egg-info → buildz-0.4.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.4.8
+Version: 0.4.91
 Summary: 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
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz
@@ -28,6 +28,8 @@ License-File: LICENSE
 
 运行python -m buildz查看帮助
 
+PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
+
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf
 2, a ioc profile file read function base on xf format, module is in buildz.ioc
 3, other tools module:
@@ -42,4 +44,6 @@ code relationship:
     buildz.demo use all other modules
 
 run python -m buildz to see help
+
+PS: testing speed on json.loads(has modified scanner.py in json module to make it purely run on Python, which make it run slower) and xf.loads(real func is buildz.xf.readz.loads), xf.loads takes 7 times longer than json.loads, it may cost by more func calls and more string cutting and reading(to make codes more structuring and easier to update)
 ```

{buildz-0.4.8 → buildz-0.4.91}/README.md

@@ -15,6 +15,8 @@
 
 运行python -m buildz查看帮助
 
+PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
+
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf
 2, a ioc profile file read function base on xf format, module is in buildz.ioc
 3, other tools module:
@@ -29,4 +31,6 @@ code relationship:
     buildz.demo use all other modules
 
 run python -m buildz to see help
+
+PS: testing speed on json.loads(has modified scanner.py in json module to make it purely run on Python, which make it run slower) and xf.loads(real func is buildz.xf.readz.loads), xf.loads takes 7 times longer than json.loads, it may cost by more func calls and more string cutting and reading(to make codes more structuring and easier to update)
 ```

{buildz-0.4.8 → buildz-0.4.91}/buildz/__init__.py

@@ -1,7 +1,8 @@
 #coding=utf-8
 
-__version__="0.4.5"
+__version__="0.4.91"
 
+# 小号多
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"
 
 from .argx import fetch as args

{buildz-0.4.8 → buildz-0.4.91}/buildz/argx.py

@@ -1,5 +1,41 @@
 #coding=utf-8
 import sys
+class Fetch:
+    """
+    命令行参数读取
+    ft = Fetch("id,name,kind".split(","), {"a":"age"})
+        or
+    ft = Fetch(*xf.loads("[[id,name,kind],{a:age}]"))
+
+    ft("001 zero life -a12".split(" ")) = {'id': '001', 'name': 'zero', 'kind': 'life', 'age': '12'}
+
+    但更简单的方法是:
+    xf.args("{id:'001', name: zero, kind: life, age: 12}".split(" ")) = {'id': '001', 'name': 'zero', 'kind': 'life', 'age': 12}
+    python buildz.xf {id:'001', name: zero, kind: life, age: 12}
+    就是对引号不太适用
+    """
+    def __init__(self, args = [], maps ={}):
+        self.args = args
+        self.maps = maps
+    def __call__(self, argv = None):
+        args, maps = fetch(argv)
+        rst = {}
+        for i in range(len(args)):
+            if i >= len(self.args):
+                break
+            key = self.args[i]
+            rst[key] = args[i]
+        for key in maps:
+            rst[key] = maps[key]
+        for key in self.maps:
+            rkey = self.maps[key]
+            if key in rst:
+                val = rst[key]
+                rst[rkey] = val
+                del rst[key]
+        return rst
+
+pass
 def fetch(argv = None):
     r"""
     format: a b c -a 123 -b456 --c=789 +d  -x"??? ???" y z

{buildz-0.4.8 → buildz-0.4.91}/buildz/demo/myers/deal.py

@@ -10,7 +10,10 @@ class Deal:
         opt = args[1]
         fp1 = args[2]
         fp2 = args[3]
-        fp_step = args[4]
+        if len(args)>4:
+            fp_step = args[4]
+        else:
+            fp_step = "steps.diff"
         mark_encode = argx.get(maps, 'e', 1)
         mark_txt = argx.get(maps, 't', None)
         if mark_txt:
@@ -19,12 +22,16 @@ class Deal:
         nspt = argx.get(maps, 'ns', 0)
         if nspt:
             spt = 0
-        if opt == 'diff':
+        if opt == 'diff' or opt == 'count':
             bs1 = fz.read(fp1).decode("utf-8")
             bs2 = fz.read(fp2).decode("utf-8")
             #bs1 = b"text z xxxyzijsa"
             #bs2 = b"test xxxx afzjcovijsax"
             stps = tz.m_steps(bs1, bs2,split=spt)
+            if opt == 'count':
+                cnt = tz.m_count(stps)
+                print(f"diff from {fp1} to {fp2}: {cnt}")
+                return
             if mark_encode:
                 stps = b"e"+tz.m_encode(stps)
             else:

{buildz-0.4.8 → buildz-0.4.91}/buildz/demo/res/help/myers.js

@@ -2,10 +2,11 @@
 text= 
 r"""
 文件比较（模仿git diff）:
-    python -m buildz myers 操作 文件路径1 文件路径2 step文件 [+e/t/s/ns]
+    python -m buildz myers 操作 文件路径1 文件路径2 [step文件] [+e/t/s/ns]
     操作:
         diff: 计算文件1到文件2需要的步骤，保存到step文件
         update: 文件1根据step文件修改，保存到文件2
+        count: 计算文件1到文件2的差异
     可选:
         +e: step文件字节保存（默认）
         +t: step文件字符串保存
@@ -19,10 +20,11 @@ r"""
 text.en= 
 r"""
 file compare:
-    python -m buildz myers opt file1 file2 step_file
+    python -m buildz myers opt file1 file2 [step_file] [+e/t/s/ns]
     opt:
         diff: calucate steps from file1 to fiel2, save into step_file
         update: update file1 by step_file, save into file2
+        count: count differenct from file1 to file2
     options:
         +e: step_file save in bytes(default)
         +t: step_file save by string

{buildz-0.4.8 → buildz-0.4.91}/buildz/demo/res/test.js

@@ -18,6 +18,7 @@
             # 字符串里有特殊符合，还是要用引号括起来
             # if special charater is contained  in string, use '' or "" to wrap string
             'a:b':"{c,d,e,f}"
+            <1,int>=<0,bool>
         }
     ]
 }

{buildz-0.4.8 → buildz-0.4.91}/buildz/tz/__init__.py

@@ -1,11 +1,12 @@
 #coding=utf-8
 #author: Zzz, emails: 1174534295@qq.com, 1309458652@qq.com
 
-# 代码差异
-from .myers_diff import update as m_update, myers as m_steps, encode as m_encode, decode as m_decode
+# 文件差异
+from .myers_diff import update as m_update, myers as m_steps, encode as m_encode, decode as m_decode,count as m_count
 
 """
 工具模块
+toolz简写成tz
 
 """
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.4.8 → buildz-0.4.91}/buildz/tz/myers_diff.py

@@ -116,6 +116,20 @@ def combine(steps):
         rst.append(step)
     return rst
 
+pass
+def count(steps):
+    cnt = 0
+    cadd,cdel = 0,0
+    #print(f"steps: {len(steps)}")
+    for step in steps:
+        if step[0] == ACT_ADD:
+            cnt+=len(step[2])
+            cadd+=len(step[2])
+        else:
+            cnt+=1+step[2]-step[1]
+            cdel +=1+step[2]-step[1]
+    return cnt#,cadd,cdel
+
 pass
 def update(s, steps, split=1):
     """

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/__init__.py

@@ -1,5 +1,5 @@
 
-from .read import loads, load
+from .readz import loads, load
 from .write import dumps, dump
 from .file import *
 from .mapz import *

buildz-0.4.91/buildz/xf/__main__.py

@@ -0,0 +1,6 @@
+#coding=utf-8
+from .xargs import test
+if __name__=="__main__":
+    test()
+
+pass

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/base.py

@@ -1,5 +1,9 @@
 
 class BaseDeal:
+    def has_prev(self):
+        return 1
+    def has_deal(self):
+        return 1
     def sp(self):
         return super(self.__class__, self)
     def regist(self, mgs):

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/buffer.py

@@ -83,3 +83,38 @@ class Buffer:
         self.buffer = self.buffer[:-size]
 
 pass
+
+class StrBuffer:
+    def read(self, size = 1, pop = 0):
+        s = self.str[self.read_base:self.read_base+size]
+        if pop:
+            self.read_base+=size
+        return s
+    def pop_read(self, size=1):
+        self.read_base+=size
+    def init(self):
+        self.buffer_base = 0
+        self.buffer_size = 0
+        self.read_base = 0
+        self.read_size = 0
+        #self.buffer = None
+        #self.s_read = None
+    def __init__(self, s):
+        self.str = s
+        self.init()
+    def add(self, arr):
+        # x = self.str[self.buffer_base+self.buffer_size:self.buffer_base+self.buffer_size+len(arr)]
+        # if x!=arr:
+        #     print(f"[ERROR] x:({x}), arr:({arr}), bb: {self.buffer_base}, bs:{self.buffer_size}, rb: {self.read_base}")
+        #     print("[["+self.str[self.buffer_base:self.read_base+10]+"]]")
+        #     raise Exception("")
+        self.buffer_size+=len(arr)
+    def size(self):
+        return self.buffer_size
+    def full(self):
+        return self.str[self.buffer_base:self.buffer_base+self.buffer_size]
+    def clean(self):
+        self.buffer_base = self.read_base
+        self.buffer_size = 0
+
+pass

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/deal/lr.py

@@ -27,6 +27,7 @@ class LRDeal(base.BaseDeal):
             if len(rm.strip())>0:
                 pos.update(rm)
                 raise exp.FormatExp(self.err("unexcept char before <lr> left symbol"), pos.get(), rm)
+            buffer.clean()
             pos.update(cl)
             queue.append(item.PrevItem(cl, pos.get(), self.id(), left = 1))
         else:

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/deal/reval.py

@@ -4,6 +4,10 @@ from .. import exp
 from . import lr
 import re
 class ValDeal(base.BaseDeal):
+    def has_prev(self):
+        return 0
+    def has_deal(self):
+        return 1
     """
         正则表达式匹配
     """

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/deal/spc.py

@@ -2,6 +2,10 @@ from .. import base
 
 
 class PrevSpcDeal(base.BaseDeal):
+    def has_prev(self):
+        return 1
+    def has_deal(self):
+        return 0
     """
         去掉左空格
     """
@@ -13,6 +17,7 @@ class PrevSpcDeal(base.BaseDeal):
             return False
         if len(c.strip())==0:
             buffer.pop_read()
+            buffer.clean()
             return True
         return False
 

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/deal/strz.py

@@ -4,6 +4,10 @@ from .. import exp
 from ... import file
 import json
 class PrevStrDeal(base.BaseDeal):
+    def has_prev(self):
+        return 1
+    def has_deal(self):
+        return 0
     def init(self, left = '"', right= '"', single_line = False, note = False, translate = False):
         self.left = left
         self.right = right
@@ -71,6 +75,7 @@ class PrevStrDeal(base.BaseDeal):
                 tmp += c
                 continue
             ctmp+=c
+        buffer.clean()
         xtmp = tmp[:-self.lr]
         if not self.note and self.single_line and xtmp.find(self.like("\n", xtmp))>=0:
             print("left:",self.left, "right:", self.right)

{buildz-0.4.8 → buildz-0.4.91}/buildz/xf/loader/mg.py

@@ -3,6 +3,7 @@ from . import buffer
 from . import base
 from . import pos
 from . import exp
+from ..stack import Stack
 class Manager:
     def fcs(self, fc, *args, **maps):
         return fc(*self.cs(*args), **maps)
@@ -16,11 +17,14 @@ class Manager:
         if self.bts:
             s = s.encode(self.code)
         return s
+    # 上面这些没用
     def add(self,obj):
         #obj.init()
         obj.regist(self)
-        self.prevs.append(obj.prev)
-        self.deals.append(obj.deal)
+        if obj.has_prev():
+            self.prevs.append(obj.prev)
+        if obj.has_deal():
+            self.deals.append(obj.deal)
         return self
     def do(self, fcs, *argv, **maps):
         for fc in fcs:
@@ -36,21 +40,39 @@ class Manager:
         self.deals = []
         self.prevs = []
     def load(self, reader):
-        buff = buffer.Buffer(reader)
+        if type(reader) in [str, bytes]:
+            #print(f"try str, {len(reader)}")
+            buff = buffer.StrBuffer(reader)
+            s = reader.replace(" ", "")
+            queue = Stack(len(s)+1)
+        else:
+            buff = buffer.Buffer(reader)
+            queue = []
         _pos = pos.PosCal()
-        queue = []
         self.pos = _pos
         self.buffer = buff
         self.queue = queue
+        import time
+        crr = time.time()
         while self.do(self.prevs, buff, queue, _pos):
             pass
-        stack = []
+        now = time.time()
+        #print(f"prev time: {now - crr}, prevs: {len(self.prevs)}, queue: {len(queue)}")
+        #stack = []
+        stack = Stack(len(queue))
+        #stack = []
+        crr = time.time()
+        ns = 0
         while self.do(self.deals, queue, stack):
+            ns = max(len(stack), ns)
             pass
+        now = time.time()
+        #print(f"deal time: {now - crr}, deals: {len(self.deals)}, stack: {ns}")
         if len(stack)==0:
             raise Exception("ERROR not data")
         for _item in stack:
             if not _item.check(is_val=1):
+                print(f"err item: {_item}")
                 raise exp.FormatExp("format error found", _item.pos)
         if len(stack)==1:
             return stack[0].val

buildz-0.4.91/buildz/xf/loaderz/base.py

@@ -0,0 +1,34 @@
+
+class BaseDeal:
+    def has_prev(self):
+        return 1
+    def has_deal(self):
+        return 1
+    def labels(self):
+        return []
+    def types(self):
+        return []
+    def prepare(self, msg):
+        pass
+    def regist(self, mgs):
+        if self._id is None:
+            self._id = mgs.regist()
+        self.prepare(mgs)
+    def id(self):
+        return self._id
+    def __str__(self):
+        return "BaseDeal"
+    def __repr__(self):
+        return str(self)
+    def __init__(self, *argv, **maps):
+        self._id = None
+        self.init(*argv, **maps)
+    def init(self, *argv, **maps):
+        pass
+    def deal(self, buffer, rst, mg):
+        pass
+    def build(self):
+        pass
+
+pass
+

buildz-0.4.91/buildz/xf/loaderz/buffer.py

@@ -0,0 +1,101 @@
+
+class BufferInput:
+    def __init__(self, buf):
+        self.buf = buf
+    def __call__(self, size=1):
+        s = self.buf[:size]
+        self.buf = self.buf[size:]
+        return s
+
+pass
+
+class Buffer:
+    def read_cache(self, size = 1):
+        s = self.read(size)
+        self.buffer+=s
+        self.s_read = self.s_read[len(s):]
+        return s
+    def read(self, size = 1):
+        if self.s_read is None:
+            self.s_read = self.input(1)
+        l = len(self.s_read)
+        if l<size:
+            self.s_read += self.input(size-l)
+        rst = self.s_read[:size]
+        if self.buffer is None:
+            self.buffer = self.s_read[:0]
+        return rst
+    def clean2read(self, size = 1):
+        self.s_read = self.s_read[size:]
+        self.clean()
+    def init(self):
+        self.buffer = None
+        self.s_read = None
+    def __init__(self, input):
+        self.input = input
+        self.init()
+    def add(self, size):
+        if self.buffer is None:
+            self.buffer = self.s_read[:size]
+        else:
+            self.buffer += self.s_read[:size]
+    def size(self):
+        if self.buffer is None:
+            return 0
+        return len(self.buffer)
+    def full(self, size = 0, right = 1):
+        return self.buffer
+    def clean(self):
+        self.buffer = self.buffer[:0]
+    def rget(self, size=1):
+        return self.buffer[-size:]
+    def get(self, size=1):
+        return self.buffer[:size]
+
+pass
+
+class StrBuffer:
+    def read_cache(self, size = 1):
+        s = self.read(size)
+        l = len(s)
+        self.buffer_size+=l
+        self.read_base+=l
+        return s
+    def read(self, size = 1):
+        s = self.str[self.read_base:self.read_base+size]
+        return s
+    def clean2read(self, size = 1):
+        self.read_base+=size
+        self.clean()
+    def init(self):
+        self.buffer_base = 0
+        self.buffer_size = 0
+        self.read_base = 0
+        self.read_size = 0
+        #self.buffer = None
+        #self.s_read = None
+    def __init__(self, s):
+        self.str = s
+        self.init()
+    def add(self, size):
+        # x = self.str[self.buffer_base+self.buffer_size:self.buffer_base+self.buffer_size+len(arr)]
+        # if x!=arr:
+        #     print(f"[ERROR] x:({x}), arr:({arr}), bb: {self.buffer_base}, bs:{self.buffer_size}, rb: {self.read_base}")
+        #     print("[["+self.str[self.buffer_base:self.read_base+10]+"]]")
+        #     raise Exception("")
+        self.buffer_size+=size
+    def size(self):
+        return self.buffer_size
+    def full(self):
+        return self.str[self.buffer_base:self.buffer_base+self.buffer_size]
+    def clean(self):
+        self.buffer_base = self.read_base
+        self.buffer_size = 0
+    def rget(self, size=1):
+        size = min(size, self.buffer_size)
+        return self.str[self.buffer_base+self.buffer_size-size:self.buffer_base+self.buffer_size]
+    def get(self, size=1):
+        size = min(size, self.buffer_size)
+        return self.str[self.buffer_base:self.buffer_base+size]
+
+pass

buildz-0.4.91/buildz/xf/loaderz/deal/listz.py

@@ -0,0 +1,19 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class ListDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        super().init(left, right, 'list')
+    def build(self, arr):
+        rst = []
+        for _item in arr:
+            if not _item.is_val:
+                raise Exception("error in list:"+_item)
+            rst.append(_item.val)
+        return item.Item(rst, type='list', is_val = 1)
+
+pass

buildz-0.4.91/buildz/xf/loaderz/deal/lr.py

@@ -0,0 +1,58 @@
+from .. import base
+from .. import item
+from .. import exp
+class LRDeal(base.BaseDeal):
+    def labels(self):
+        return [self.left]
+    def types(self):
+        return []
+    def deal(self, buffer, rst, mg):
+        cl = buffer.read(self.ll)
+        if self.left!=cl:
+            return False
+        _arr = []
+        rm = buffer.full().strip()
+        buffer.clean2read(self.ll)
+        if len(rm)>0:
+            arr.append(item.Item(rm, type="", is_val=False))
+        while True:
+            cr = buffer.read(self.lr)
+            if cr == self.right:
+                rm = buffer.full().strip()
+                buffer.clean2read(self.lr)
+                break
+            if not mg.deal(buffer, _arr):
+                raise Exception("Error lr")
+        buffer.clean()
+        if len(rm)>0:
+            _arr.append(item.Item(rm ,type = '', is_val=False))
+        dts = []
+        for k in _arr:
+            _k = mg.build(k)
+            if item.is_null(_k):
+                continue
+            dts.append(_k)
+        #dts = [mg.build(k) for k in _arr]
+        obj = self.build(dts)
+        rst.append(obj)
+        return True
+    def build(self, obj):
+        return item.Item(obj, type = self.type, is_val=True)
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def prepare(self, mg):
+        self.left = mg.like(self.left)
+        self.right = mg.like(self.right)
+        self.ll = len(self.left)
+        self.lr = len(self.right)
+    def init(self, left, right, name= "lr"):
+        self.left = left
+        self.right = right
+        self.ll = len(left)
+        self.lr = len(right)
+        self.name = name
+    def err(self, s):
+        return s.replace("<lr>", self.name)
+
+pass

buildz-0.4.91/buildz/xf/loaderz/deal/lrval.py

@@ -0,0 +1,40 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+from . import reval
+class Fcs:
+    def __init__(self):
+        self.maps = {}
+    def set(self, _type, fc):
+        self.maps[_type] = fc
+    def __call__(self, val, _type):
+        if _type not in self.maps:
+            raise Exception("unreginize type:"+_type)
+        return self.maps[_type](val)
+
+pass
+
+
+class LRValDeal(lr.LRDeal):
+    """
+    """
+    def init(self, left, right, fc):
+        super().init(left, right, 'lrval')
+        self.fc = fc
+    def build(self, arr):
+        rst = []
+        if len(arr)!=2:
+            raise Exception("error in lrval:"+arr)
+        for _item in arr:
+            if not _item.is_val:
+                raise Exception("error in list:"+_item)
+            rst.append(_item.val)
+        try:
+            val = self.fc(rst[0], rst[1])
+        except Exception 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)
+
+pass

buildz-0.4.91/buildz/xf/loaderz/deal/mapz.py

@@ -0,0 +1,24 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class MapDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        super().init(left, right, "map")
+    def build(self, arr):
+        rst = {}
+        if len(arr)%3!=0:
+            raise Exception(f"u f in map: {arr}")
+        for i in range(0, len(arr), 3):
+            k = arr[i]
+            v = arr[i+2]
+            opt = arr[i+1]
+            if opt.type != "kv":
+                raise Exception(f"u f opt in map: {opt}")
+            rst[k.val] = v.val
+        return item.Item(rst, type='map', is_val = 1)
+
+pass