buildz 0.4.7__tar.gz → 0.4.8__tar.gz

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

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

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

@@ -19,7 +19,6 @@ class Deal:
         nspt = argx.get(maps, 'ns', 0)
         if nspt:
             spt = 0
-        print(f"SPT:{spt}")
         if opt == 'diff':
             bs1 = fz.read(fp1).decode("utf-8")
             bs2 = fz.read(fp2).decode("utf-8")
@@ -36,6 +35,7 @@ class Deal:
                 stps = "t"+xf.dumps(stps)
                 stps = stps.encode()
             fz.write(fp_step, stps)
+            print("done diff")
         elif opt == 'update':
             bs1 = fz.read(fp1).decode("utf-8")
             bs_step = fz.read(fp_step)
@@ -47,6 +47,7 @@ class Deal:
                 stps = xf.loads(bs_step.decode())
             bs2 = tz.m_update(bs1, stps,split=spt).encode("utf-8")
             fz.write(fp2, bs2)
+            print("done update")
         else:
             print(f"unexpect opt: {opt}")
     pass

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

@@ -11,15 +11,36 @@ def encode(steps, as_str = False):
         步骤列表转bytes/str
     """
     rst = b""
+    # 加减的长度设置最多2**15-1，保留1位当作“加/减”，4位整数当字符串位置索引
+    max16 = 2**15-1
     for step in steps:
         if step[0] == ACT_ADD:
             bs = step[2]
             if type(bs) == str:
                 bs = bs.encode("utf-8")
-            obj = struct.pack(">BII", 1, step[1], len(bs))+bs
+            bs_arr = []
+            while len(bs)>max16:
+                cut = bs[:max16]
+                bs = bs[max16:]
+                bs_arr.append(cut)
+            if len(bs)>0:
+                bs_arr.append(bs)
+            for bs in bs_arr:
+                obj = struct.pack(">HI", len(bs)*2+1, step[1])+bs
+                rst+=obj
         else:
-            obj = struct.pack(">BII", 0, step[1], step[2])
-        rst+=obj
+            s1 = step[1]
+            s2 = step[2]
+            nexts = [s1]
+            while (s2-s1)>max16:
+                nexts.append(s1+max16)
+                s1+=max16+1
+            if s1<=s2:
+                nexts.append(s2)
+            for i in range(1,len(nexts)):
+                obj = struct.pack(">HI", (nexts[i]-nexts[i-1])*2, nexts[i-1])
+                rst+=obj
+        #rst+=obj
     if as_str:
         rst = base64.b64encode(rst).decode()
     return rst
@@ -31,19 +52,22 @@ def decode(obj):
     """
     if type(obj) == str:
         obj = base64.b64decode(obj)
-    ni = 1+4+4
+    ni = 2+4
     rst = []
     while len(obj)>0:
         bs = obj[:ni]
         obj = obj[ni:]
-        act, base, c = struct.unpack(">BII", bs)
+        v2, base = struct.unpack(">HI", bs)
+        act = v2%2
+        c = v2//2
+        #act, base, c = struct.unpack(">HI", bs)
         if act == 1:
             bs = obj[:c]
             obj = obj[c:]
             s = bs.decode("utf-8")
             tmp = [ACT_ADD, base, s]
         else:
-            tmp = [ACT_DEL, base, c]
+            tmp = [ACT_DEL, base, base+c]
         rst.append(tmp)
     return rst
 

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

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

{buildz-0.4.7 → buildz-0.4.8}/setup.py

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