buildz 0.6.38__tar.gz → 0.6.39__tar.gz

{buildz-0.6.38/buildz.egg-info → buildz-0.6.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.38
+Version: 0.6.39
 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.38 → buildz-0.6.39}/buildz/ioc/ioc/conf.py

@@ -197,6 +197,10 @@ class Conf(Base):
         return self.confs.set_var(key, val)
     def unset_var(self, key):
         return self.confs.unset_var(key)
+    def set_vars(self, vars):
+        return self.confs.set_vars(vars)
+    def unset_vars(self, vars):
+        return self.confs.unset_vars(vars)
     def var_keys(self):
         return self.confs.var_keys()
     def push_var(self, key, val):

{buildz-0.6.38 → buildz-0.6.39}/buildz/ioc/ioc/confs.py

@@ -274,6 +274,10 @@ class Confs(Base):
         if not self.has_var(key):
             return None, False
         return self.vars[key][i], True
+    def set_vars(self, vars):
+        [self.set_var(key,val) for key,val in vars.items()]
+    def unset_vars(self, vars):
+        [self.unset_var(key) for key in vars]
     def push_vars(self, vars):
         if vars is not None:
             [self.push_var(key,val) for key,val in vars.items()]
@@ -370,16 +374,20 @@ class Confs(Base):
             raise
         #return self.add(conf)
     def add_decorator(self):
+        decorator.bind_confs(self)
+        return
         confs = decorator.all()
         return self.adds(confs)
-        conf = decorator()
-        #print(f"[TESTZ] CONFS add decorator(): {conf}")
-        return self.add(conf)
+        # conf = decorator()
+        # #print(f"[TESTZ] CONFS add decorator(): {conf}")
+        # return self.add(conf)
     def add_wrap(self):
         return self.add_decorator()
     def adds(self, confs):
         for conf in confs:
             self.add(conf)
+    def get_conf(self, id):
+        return self.confs[id]
     def add(self, conf):
         """
             {

{buildz-0.6.38 → buildz-0.6.39}/buildz/ioc/ioc/decorator.py

@@ -4,13 +4,20 @@ from buildz import xf
 from threading import Lock
 class Decorator(Base):
     def init(self):
-        self.conf = {}
+        #self.conf = {}
         self.confs = {}
-        self.confs[None] = self.conf
+        self.confs[None] = {}
+        self.objs = {}
+        self.ids = {}
         self.namespace = None
         self.fcs = {}
         self._ns = {}
         self.regist("add_datas", self.add_datas)
+    def get_conf_obj(self, ns):
+        return self.objs[ns]
+    @property
+    def conf(self):
+        return self.get_conf_obj(self.namespace)
     def fcns(self, namespace, fc):
         self._ns[fc] = namespace
     def ns(self, namespace):
@@ -60,20 +67,32 @@ class Decorator(Base):
         return self.add("inits", val)
     def add_locals(self, item):
         return self.add("locals", item)
+    def bind_confs(self, confs):
+        for ns, val in self.confs.items():
+            id = confs.add(val)
+            obj = confs.get_conf(id)
+            self.ids[ns] = id
+            self.objs[ns] = obj
     def all(self):
         arr = [val for k,val in self.confs.items()]
         return arr
-    def call(self):
-        return self.conf
+    # def call(self):
+    #     return self.conf
 
 pass
 
 decorator = Decorator()
 class Fcs:
-    pass
+    def __init__(self, k, ns):
+        self._ioc_ns = [k, ns]
+    @property
+    def conf(self):
+        return self._ioc_ns[1].get_conf(self._ioc_ns[0])
 
 pass
 class NameSpace(Base):
+    def get_conf(self, ns):
+        return self.decorator.get_conf_obj(ns)
     def init(self, decorator):
         self.decorator = decorator
         self.lock = Lock()
@@ -89,7 +108,7 @@ class NameSpace(Base):
         return wfc
     def call(self, namespace):
         fcs = self.decorator.fcs
-        obj = Fcs()
+        obj = Fcs(namespace, self)
         for k,f in fcs.items():
             setattr(obj, k, self.fc(namespace, f))
         def wfc(rfc, *a, **b):

{buildz-0.6.38 → buildz-0.6.39}/buildz/ioc/ioc_deal/obj.py

@@ -217,24 +217,27 @@ pass
 ioc_conf_key = "_buildz_ioc_conf"
 class IOCConf(Basez):
     def init(self, key = "_buildz_ioc_conf", ckey = "_buildz_ioc_conf_cls"):
-        self.key = key
-        self.ckey = ckey
+        self.maps = {}
+        self.cmaps = {}
     def get(self, cls, default):
-        if not hasattr(cls, self.ckey):
+        key = id(cls)
+        if key not in self.cmaps:
             return default
-        prv = getattr(cls, self.ckey)
+        prv = self.cmaps[key]
         if prv!=cls:
             return default
-        if hasattr(cls, self.key):
-            return getattr(cls, self.key)
+        if key in self.maps:
+            return self.maps[key]
         return default
     def unset(self, cls):
-        if hasattr(cls, self.ckey):
-            delattr(cls, self.ckey)
-            delattr(cls, self.key)
+        key = id(cls)
+        if key in self.cmaps:
+            del self.cmaps[key]
+            del self.maps[key]
     def set(self, cls, dt):
-        setattr(cls, self.key, dt)
-        setattr(cls, self.ckey, cls)
+        key = id(cls)
+        self.maps[key] = dt
+        self.cmaps[key] = cls
 
 pass
 g_ioc_conf = IOCConf()

{buildz-0.6.38 → buildz-0.6.39}/buildz/logz.py

@@ -5,7 +5,7 @@ from . import xf, ioc, fz
 from .base import Base
 from .ioc import wrap
 #from .tools import *
-import time, sys
+import time, sys, threading
 ns = wrap.ns("buildz.logz")
 @ns.obj(id="baseLog")
 @ns.obj_args("ref, buildz.logz.shows, null", "ref, buildz.logz.tag, null", "ref, buildz.logz.base, null")
@@ -24,17 +24,26 @@ class Log(Base):
         return log
     def get_tag(self):
         return self._tag
-    def init(self, shows = None, tag= None, base = None):
+    def init(self, shows = None, tag= None, base = None, lock = False):
         if shows is None:
             shows = ["info", "debug", "warn", "error"]
         self.shows=shows
         self._tag = tag
         self.base = base
+        if lock:
+            self.lock = threading.Lock()
+        else:
+            self.lock = None
+    def log(self, level, tag, *args):
+        if self.lock is not None:
+            with self.lock:
+                return self.do_log(level, tag, *args)
+        return self.do_log(level, tag, *args)
     def xlog(self, level, *args):
         if level not in self.shows:
             return
         self.log(level, self.tag, *args)
-    def log(self, level, tag, *args):
+    def do_log(self, level, tag, *args):
         if self.base is not None:
             return self.base.log(level, tag, *args)
         raise Exception("unimpl")
@@ -70,14 +79,14 @@ def mstr(s):
 @ns.obj(id="formatLog")
 @ns.obj_args("ref, buildz.logz.shows, null", "ref, buildz.logz.tag, null", "ref, buildz.logz.format, null")
 class FormatLog(Log):
-    def init(self, shows =None, tag=None, format=None):
+    def init(self, shows =None, tag=None, format=None, lock = False):
         if format is None:
             format = "[{LEVEL}] %Y-%m-%d %H:%M:%S {tag} {msg}\n"
         self.format=format
-        super().init(shows, tag)
+        super().init(shows, tag, lock)
     def output(self, msg):
         raise Exception("impl")
-    def log(self, level, tag, *args):
+    def do_log(self, level, tag, *args):
         m_level = level.lower()
         u_level = level.upper()
         x_level = mstr(level)
@@ -89,8 +98,8 @@ class FormatLog(Log):
         msg = replaces(rst, "{Level}", x_level, "{level}", m_level, "{LEVEL}", u_level, "{tag}", tag, "{msg}", msg)
         self.output(msg)
 class FpLog(FormatLog):
-    def init(self, fp = None,shows =None, tag=None, format=None):
-        super().init(shows, tag, format)
+    def init(self, fp = None,shows =None, tag=None, format=None, lock = False):
+        super().init(shows, tag, format, lock)
         self.fp = fp
     def output(self, msg):
         #sys.stdout.write(msg)
@@ -110,10 +119,10 @@ wrap.decorator.add_datas("[logs.list, refs], buildz\.logz\.item,", ns = "buildz.
 @ns.obj(id="logs")
 @ns.obj_args("ref, logs.list, []", "ref, buildz.logz.shows,null", "ref, buildz.logz.tag, null")
 class Logs(Log):
-    def init(self, logs, shows = None, tag= None):
-        super().init(shows, tag)
+    def init(self, logs, shows = None, tag= None, lock = False):
+        super().init(shows, tag, lock=lock)
         self.logs = logs
-    def log(self, level, tag, *args):
+    def do_log(self, level, tag, *args):
         for _log in self.logs:
             _log.log(level, tag, *args)
 

buildz-0.6.39/buildz/pathz.py

@@ -0,0 +1,58 @@
+from . import Base
+import os,sys,json,time
+class Path(Base):
+    def init(self, **maps):
+        self.paths = {}
+        self.fcs = {}
+        self.lasts = {}
+        for k, v in maps.items():
+            self.set(k, v)
+    @staticmethod
+    def join(*a):
+        return os.path.join(*a)
+    @staticmethod
+    def rjoin(path, *a):
+        if path is None:
+            return os.path.join(*a)
+        return os.path.join(path, *a)
+    @staticmethod
+    def rfp(paths, *a, last=-1):
+        #print(f"[TESTZ] a: {a}, paths: {paths}")
+        #fp = os.path.join(*a)
+        for path in paths:
+            _fp = Path.rjoin(path, *a)
+            if os.path.exists(_fp):
+                return _fp
+        return Path.rjoin(paths[last], *a)
+    def set(self, name, paths, last = -1, curr = None):
+        if type(paths) not in (list, tuple):
+            paths = [paths]
+        if curr is not None and None not in paths:
+            if curr in (0, 'first'):
+                paths = [None]+paths
+            elif curr in (-1, 'last'):
+                paths.append(None)
+            else:
+                assert False
+        self.paths[name] = paths
+        self.lasts[name] = last
+        def fc(*a):
+            return self.rfp(paths, *a, last=last)
+        self.fcs[name] = fc
+    def __getattr__(self, name):
+        return self.fcs[name]
+    def call(self, *obj):
+        it = obj[0]
+        fc = self.join
+        if type(it) in (list, tuple):
+            assert len(it)==2
+            k, fp = it
+            fc = self.fcs[k]
+        rst = []
+        for it in obj:
+            if type(it) in (list, tuple):
+                assert len(it)==2
+                rst.append(it[1])
+        return fc(*rst)
+
+pass

{buildz-0.6.38 → buildz-0.6.39/buildz.egg-info}/PKG-INFO

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

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

buildz-0.6.38/buildz/pathz.py

@@ -1,33 +0,0 @@
-from . import Base
-import os,sys,json,time
-class Path(Base):
-    def init(self, **maps):
-        self.paths = {}
-        self.fcs = {}
-        for k, v in maps.items():
-            self.set(k, v)
-    @staticmethod
-    def join(*a):
-        return os.path.join(*a)
-    def set(self, name, path):
-        self.paths[name] = path
-        def fc(*a):
-            return self.join(path, *a)
-        self.fcs[name] = fc
-    def __getattr__(self, name):
-        return self.fcs[name]
-    def call(self, *obj):
-        it = obj[0]
-        fc = self.join
-        if type(it) in (list, tuple):
-            assert len(it)==2
-            k, fp = it
-            fc = self.fcs[k]
-        rst = []
-        for it in obj:
-            if type(it) in (list, tuple):
-                assert len(it)==2
-                rst.append(it[1])
-        return fc(*rst)
-
-pass