buildz 0.6.8__tar.gz → 0.6.10__tar.gz

{buildz-0.6.8/buildz.egg-info → buildz-0.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.8
+Version: 0.6.10
 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.8 → buildz-0.6.10}/buildz/__init__.py

@@ -6,4 +6,4 @@ __version__="0.4.91"
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"
 
 from .argx import fetch as args
-from .base import Base
+from .base import Base, WBase

buildz-0.6.10/buildz/base.py

@@ -0,0 +1,55 @@
+#coding=utf-8
+from . import pyz
+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
+
+class WBase(Base):
+    def _open(self):
+        pass
+    def open(self):
+        self._open()
+        return pyz.with_out(self.close, True)
+    def _close(self):
+        pass
+    def close(self, exc_type, exc_val, exc_tb):
+        self._close()
+
+pass
+
+class With(Base):
+    def init(self, args=False):
+        self.args = args
+    def call(self, cls):
+        def _open(obj):
+            pass
+        def open(obj):
+            obj._open()
+            return pyz.with_out(obj.close, self.args)
+        def _close(obj):
+            pass
+        def close(obj):
+            obj._close()
+        cls._open = _open
+        cls._close = _close
+        cls.open = open
+        cls.close = close
+        return cls
+
+pass

{buildz-0.6.8 → buildz-0.6.10}/buildz/ioc/ioc/base.py

@@ -40,10 +40,12 @@ class EncapeData(Base):
             info: 额外的调用信息，目前只有object会用到里面的id字段，作为单例额外输入
         """
         if typez(data)==dict:
-            pid = xf.g1(data, parent=None)
+            pid = xf.g1(data, parent=None, template=None, temp=None)
             if pid is not None:
                 data = dict(data)
-                del data['parent']
+                for pkey in "parent,temp,template".split(","):
+                    if pkey in data:
+                        del data[pkey]
                 pids = pid
                 if typez(pids)!=list:
                     pids = [pid]

{buildz-0.6.8 → buildz-0.6.10}/buildz/ioc/ioc/confs.py

@@ -53,7 +53,9 @@ class Confs(Base):
         return sysdt
     def build_env_args_xf(self):
         data = xf.args()
-        env = data['env']
+        if xf.is_args(data):
+            data = data.maps
+        env = xf.g(data, env={})
         self.envs_args = env
         self.flush_env(self.envs_args)
     def build_env_args_buildz(self):
@@ -83,6 +85,7 @@ class Confs(Base):
         return None
     def get_env_maps(self, id, maps):
         ids = self.env_ids(id)
+        #print(f"[TZBZ] get_env_maps({id})[{ids}] in {maps}")
         envs = maps
         for id in ids:
             if type(envs)!=dict:
@@ -95,10 +98,23 @@ class Confs(Base):
         return envs
     def get_env_conf(self, id, sid=None):
         return self.get_env_maps(id, self.envs)
+    def enable_args(self, enable = True):
+        key = "args"
+        if enable:
+            if key in self.env_orders:
+                return
+            self.env_orders = [key]+self.env_orders
+        else:
+            if key not in self.env_orders:
+                return
+            self.env_orders.remove(key)
+    def set_args_type(self, args_type):
+        self.args_type = args_type
     def get_env(self, id, sid=None):
         for key in self.env_orders:
             fc = self.env_fcs[key]
             obj = fc(id, sid)
+            #print(f"[TZBZ] get_env.{key}.{fc}({id}, {sid}): {obj}")
             if obj is not None:
                 return obj
         return None
@@ -120,6 +136,9 @@ class Confs(Base):
                 break 
             envs = envs[id]
         return envs
+    def set_envs(self, maps):
+        self.flush_env(maps)
+        self.update_env(maps)
     def set_env(self, id, val):
         obj = {id:val}
         self.flush_env(obj)

buildz-0.6.10/buildz/ioc/ioc_deal/branch.py

@@ -0,0 +1,47 @@
+#
+from ..ioc.base import Base, EncapeData,IOCError
+from .base import FormatData,FormatDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+class BranchDeal(FormatDeal):
+    """
+        分支branch:
+            {
+                id: id
+                type: branch
+                judge: item_conf
+                vals: {
+                    judge_val: item_conf
+                    ...
+                }
+                default(optional): item_conf
+            }
+        简写：
+            [[id, branch], judge, {vals}, default]
+            [branch, judge, {vals}, default]
+            [branch, judge, {vals}]
+        例:
+            [branch, [env, env.test], {true:..., false: ...}]
+    """
+    def init(self, fp_lists=None, fp_defaults=None):
+        super().init("BranchDeal", fp_lists, fp_defaults, join(dp, "conf", "branch_lists.js"), None)
+    def deal(self, edata:EncapeData):
+        data = edata.data
+        data = self.fill(data)
+        judge = xf.get_first(data, 'judge', 'key', 'var')
+        judge = self.get_obj(judge, edata.conf, edata.src, edata.info)
+        vals = xf.get_first(data, 'vals', 'data', 'datas')
+        val = None
+        if judge in vals:
+            val = vals[judge]
+            val = self.get_obj(val, edata.conf, edata.src, edata.info)
+            return val
+        if 'default' not in data:
+            raise IOCError(f"<branch> not any vals match '{judeg}'")
+        default = data['default']
+        val = self.get_obj(default, edata.conf, edata.src, edata.info)
+        return val
+
+pass

buildz-0.6.10/buildz/ioc/ioc_deal/conf/branch_lists.js

@@ -0,0 +1,26 @@
+// [[id, type], key]
+[
+    {
+        nullable: 0,
+        out: 1,
+        conf: {
+            //sort:-1,
+            data:[
+                {key: type, default: null }
+                {key: id, default: null},
+            ]
+        }
+    },
+    {
+        nullable: 0,
+        key: judge
+    },
+    {
+        nullable: 0,
+        key: vals
+    },
+    {
+        nullable: 1,
+        key: default
+    }
+]

{buildz-0.6.8 → buildz-0.6.10}/buildz/ioc/ioc_deal/conf/deals.js

@@ -82,6 +82,11 @@
             type: iocf,
             note: 加配置文件,
             build: buildz.ioc.ioc_deal.iocf.IOCFObjectDeal
+        },
+        {
+            type: branch,
+            note: 条件配置,
+            build: buildz.ioc.ioc_deal.branch.BranchDeal
         }
     ]
 }

{buildz-0.6.8 → buildz-0.6.10}/buildz/pyz.py

@@ -3,7 +3,7 @@ import sys
 import os
 import hashlib
 import inspect
-from .base import Base
+#from .base import Base, WBase
 class With:
     def __init__(self, fc_in, fc_out, args = False):
         self.fc_in = fc_in

{buildz-0.6.8 → buildz-0.6.10}/buildz/tz/__init__.py

@@ -3,7 +3,7 @@
 
 # 文件差异
 from .myers_diff import update as m_update, myers as m_steps, encode as m_encode, decode as m_decode,count as m_count
-
+from .tio import *
 """
 工具模块
 toolz简写成tz

buildz-0.6.10/buildz/tz/tio/__init__.py

@@ -0,0 +1,3 @@
+#coding=utf-8
+
+from .getch import getch

buildz-0.6.10/buildz/tz/tio/base.py

@@ -0,0 +1,7 @@
+#coding=utf-8
+from buildz.base import Base, WBase, With
+@With(False)
+class Getch(Base):
+    pass
+
+pass

buildz-0.6.10/buildz/tz/tio/getch.py

@@ -0,0 +1,23 @@
+#coding=utf-8
+
+from buildz import pyz
+getch = None
+if pyz.is_windows:
+    from . import win
+    getch = win.Getch()
+else:
+    from . import lx
+    getch = lx.Getch()
+
+pass
+def open():
+    global getch
+    return getch.open()
+
+pass
+
+def close():
+    global getch
+    getch.close()
+
+pass

buildz-0.6.10/buildz/tz/tio/lx.py

@@ -0,0 +1,38 @@
+#coding=utf-8
+from . import base
+import termios
+import sys
+import ctypes
+import select
+std = ctypes.cdll.LoadLibrary(None)
+class Getch(base.Getch):
+    def __init__(self, timeout =0.01, cnt = 3):
+        attr = termios.tcgetattr(sys.stdin.fileno())
+        bak = list(attr)
+        attr[3] = attr[3] & ~(termios.ICANON|termios.ECHO)
+        self.bak = bak
+        self.attr = attr
+        self.sec = timeout
+        self.cnt = cnt
+    def _open(self):
+        termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, self.attr)
+    def _close(self):
+        termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, self.bak)
+    def call(self):
+        c = std.getchar()
+        if c==27:
+            next = False
+            # 没用
+            for i in range(self.cnt):
+                a,_b,_c = select.select([sys.stdin.fileno()], [], [], self.sec)
+                if len(a)>0:
+                    next = True
+                    break
+            if next:
+                rst = [c]
+                rst.append(std.getchar())
+                rst.append(std.getchar())
+                return rst
+        return c
+
+pass

buildz-0.6.10/buildz/tz/tio/test.py

@@ -0,0 +1,12 @@
+#coding=utf-8
+
+from buildz.tz import getch
+getch.init()
+while True:
+    c = getch()
+    print(f"getch: {c}")
+    if c==b'q'[0]:
+        break
+
+pass
+getch.close()

buildz-0.6.10/buildz/tz/tio/win.py

@@ -0,0 +1,8 @@
+#coding=utf-8
+import ctypes
+from . import base
+class Getch(base.Getch):
+    def call(self):
+        return ctypes.cdll.msvcrt._getch()
+
+pass

{buildz-0.6.8 → buildz-0.6.10}/buildz/xf/loaderz/deal/listmapz.py

@@ -15,8 +15,9 @@ class ListMapDeal(lr.LRDeal):
     """
         分隔符，有分隔符后将缓存的数据当作字符串
     """
-    def init(self, left, right):
+    def init(self, left, right, as_map = False):
         super().init(left, right, "listmap")
+        self.as_map = as_map
     def types(self):
         return ['list']
     def build(self, obj):
@@ -48,6 +49,11 @@ class ListMapDeal(lr.LRDeal):
                 lst.append(obj.val)
                 i+=1
         if len(mp)==0:
+            if self.as_map:
+                if len(lst)==0:
+                    return item.Item(mp, type="map", is_val=1)
+                else:
+                    return item.Item(Args(lst, mp), type='args', is_val=1)
             return item.Item(lst, type="list", is_val=1)
         elif len(lst)==0:
             return item.Item(mp, type="map", is_val=1)

{buildz-0.6.8 → buildz-0.6.10}/buildz/xf/readz.py

@@ -96,7 +96,7 @@ def build_args(as_bytes=False):
     # mgs.add(mapz.MapDeal("{", "}"))
     mgs.add(listmapz.ListMapDeal("(", ")"))
     mgs.add(listmapz.ListMapDeal("[", "]"))
-    mgs.add(listmapz.ListMapDeal("{", "}"))
+    mgs.add(listmapz.ListMapDeal("{", "}", True))
     build_val(mgs)
     #1,0,0,1: 没引号当r"..."
     #1,0,1,1: 没引导当"..."

{buildz-0.6.8 → buildz-0.6.10}/buildz/xf/xargs.py

@@ -1,5 +1,6 @@
 #coding=utf-8
-from .read import loads
+#from .read import loads
+from .readz import loads, loadx
 import sys
 def fetch(argv = None):
     if argv is None:
@@ -7,6 +8,7 @@ def fetch(argv = None):
     argv = [str(k) for k in argv]
     s = " ".join(argv)
     s = s.strip()
+    return loadx(s, True)
     lrs = [["",""]]
     if len(s)==0:
         return None

{buildz-0.6.8 → buildz-0.6.10/buildz.egg-info}/PKG-INFO

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

@@ -56,6 +56,7 @@ buildz/ioc/ioc/conf.py
 buildz/ioc/ioc/confs.py
 buildz/ioc/ioc/single.py
 buildz/ioc/ioc_deal/base.py
+buildz/ioc/ioc_deal/branch.py
 buildz/ioc/ioc_deal/call.py
 buildz/ioc/ioc_deal/calls.py
 buildz/ioc/ioc_deal/deal.py
@@ -73,6 +74,7 @@ buildz/ioc/ioc_deal/ref.py
 buildz/ioc/ioc_deal/val.py
 buildz/ioc/ioc_deal/var.py
 buildz/ioc/ioc_deal/xfile.py
+buildz/ioc/ioc_deal/conf/branch_lists.js
 buildz/ioc/ioc_deal/conf/call_defaults.js
 buildz/ioc/ioc_deal/conf/call_lists.js
 buildz/ioc/ioc_deal/conf/calls_defaults.js
@@ -98,6 +100,12 @@ buildz/ioc/ioc_deal/conf/xfile_defaults.js
 buildz/ioc/ioc_deal/conf/xfile_lists.js
 buildz/tz/__init__.py
 buildz/tz/myers_diff.py
+buildz/tz/tio/__init__.py
+buildz/tz/tio/base.py
+buildz/tz/tio/getch.py
+buildz/tz/tio/lx.py
+buildz/tz/tio/test.py
+buildz/tz/tio/win.py
 buildz/xf/__init__.py
 buildz/xf/__main__.py
 buildz/xf/code.py

{buildz-0.6.8 → buildz-0.6.10}/setup.py

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

buildz-0.6.8/buildz/base.py

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