buildz 0.6.14__tar.gz → 0.6.16__tar.gz

{buildz-0.6.14/buildz.egg-info → buildz-0.6.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.14
+Version: 0.6.16
 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
@@ -33,6 +33,7 @@ License-File: LICENSE
 持续更新中。。。
 2024/09/25:
 修复bug，增强html的搜索功能，增强auto配置功能
+auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
 2024/09/24:
 增加模块html:html页面解析
 增加模块auto:自动化调用

{buildz-0.6.14 → buildz-0.6.16}/README.md

@@ -20,6 +20,7 @@
 持续更新中。。。
 2024/09/25:
 修复bug，增强html的搜索功能，增强auto配置功能
+auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
 2024/09/24:
 增加模块html:html页面解析
 增加模块auto:自动化调用

{buildz-0.6.14 → buildz-0.6.16}/buildz/auto/cache.py

@@ -67,7 +67,7 @@ class Save(Base):
 
 pass
 @wrap.obj(id="cache")
-@wrap.obj_args("ref, log")
+@wrap.obj_args("ref, log", "env, cache.rfp.current.first, false")
 class Cache(Base):
     def get(self, key):
         ks = key.split(".")
@@ -76,16 +76,49 @@ class Cache(Base):
         xf.sets(self.data, key.split("."), val)
     def remove(self, key):
         xf.removes(self.data, key.split("."))
-    def init(self, log):
+    def init(self, log, current_first=False):
+        self.current_first = current_first
         self.log = log
         self.data = {}
+    def set_current(self, dp):
+        if type(dp)!=list:
+            dp = [dp]
+        self.set("cache.path.current", dp)
+    def add_current(self, dp):
+        dps = self.get_current()
+        if dps is None:
+            dps = []
+        if dp in dps:
+            return
+        dps.append(dp)
+        self.set_current(dps)
+    def get_current(self):
+        dps = self.get("cache.path.current")
+        if type(dps)!=list:
+            dps = [dps]
+        return dps
+    def rfp(self, fp):
+        dps = [None,"."]
+        cfps = self.get_current()
+        if cfps is not None:
+            if self.current_first:
+                dps = cfps+dps
+            else:
+                dps = dps+cfps
+        for dp in dps:
+            _fp = fp
+            if dp is not None:
+                _fp = os.path.join(dp, fp)
+            if os.path.isfile(_fp):
+                return _fp
+        return fp
     def call(self, maps, fp):
         fp = xf.g(maps, cache="cache.js")
         data = {}
         if os.path.isfile(fp):
             self.log.info(f"load cache from {fp}")
             data = xf.flush_maps(xf.loadf(fp),visit_list=False)
-        self.data.update(data)
+        xf.fill(data, self.data, replace=0)
         return True
 
 pass

{buildz-0.6.14 → buildz-0.6.16}/buildz/auto/config.py

@@ -5,12 +5,14 @@ from ..base import Base
 from ..ioc import wrap
 import os
 @wrap.obj(id="buildz.auto.config.load")
+@wrap.obj_set(cache="ref, cache")
 class Config(Base):
     def call(self, maps, fp):
         configs = xf.g(maps, configs=[])
         if type(configs)!=list:
             configs = [configs]
         for cfp in configs:
+            cfp = self.cache.rfp(cfp)
             if not os.path.isfile(cfp):
                 self.log.error(f"config file not exist: {cfp}")
                 return False

{buildz-0.6.14 → buildz-0.6.16}/buildz/auto/deal_type.py

@@ -4,11 +4,15 @@ from .. import ioc
 from ..base import Base
 from ..ioc import wrap
 class DealType(Base):
-    def init(self, deals = {}):
+    def init(self, deals = {}, cache = None):
         self.deals = deals
+        self.cache = cache
     def call(self, data):
         if type(data)==str:
-            data = xf.loadf(data)
+            fp = data
+            if self.cache is not None:
+                fp = self.cache.rfp(fp)
+            data = xf.loadf(fp)
         _type = xf.g(data, type = None)
         return self.deals[_type](data)
 
@@ -27,7 +31,7 @@ class DefDeal(Base):
         rst = {}
         for _type, calls in data.items():
             rst[_type] = factory(calls)
-        obj = DealType(rst)
+        obj = DealType(rst, self.mg.get("cache"))
         maps['deal_obj'] = obj
         return True
 

buildz-0.6.16/buildz/auto/run.py

@@ -0,0 +1,39 @@
+from .. import xf,fz
+from .. import ioc
+from ..base import Base
+from . import init
+import os
+class Run(Base):
+    def init(self, fps=None):
+        mg = ioc.build()
+        if fps is not None:
+            mg.add_fps(fps)
+        self.mg = mg
+    def add_current(self, dp):
+        self.mg.get("cache").add_current(dp)
+    def call(self, fp):
+        self.log = self.mg.get("log")
+        if not os.path.isfile(fp):
+            dp = os.path.dirname(fp)
+            fn = os.path.basename(fp)
+            fps = fz.search(dp, fn)
+            print(f"search dp:{dp}, fn: {fn}, rst: {fps}")
+            if len(fps)!=1:
+                self.log.error(f"can't find filepath: {fp}")
+                return False
+            fp = fps[0]
+        maps = xf.loadf(fp)
+        dp = os.path.dirname(os.path.abspath(fp))
+        self.add_current(dp)
+        config = self.mg.get("buildz.auto.config.load")
+        if not config(maps, fp):
+            return False
+        calls = xf.g(maps, calls = [])
+        for deal in calls:
+            fc = self.mg.get(deal)
+            if not fc(maps, fp):
+                return False
+        return True
+
+pass
+

{buildz-0.6.14/buildz/auto/test → buildz-0.6.16/buildz/auto/test/cache}/cache.js

@@ -10,7 +10,7 @@
     },
     test2: {
         headers: {
-            content_type: "text/html"
+            content_type: "text/html; charset=utf-8"
         }
     }
 }

{buildz-0.6.14/buildz/auto/test → buildz-0.6.16/buildz/auto/test/config}/config.js

@@ -1,7 +1,7 @@
 calls: [log, cache, def.deal.type, list, cache.save]
-cache: cache.js
-cache.save: cache.js
-log: %Y%m%d_log.txt
+cache: cache/cache.js
+cache.save: cache/cache.js
+log: log/%Y%m%d_log.txt
 def.deal: {
     types: {
         http.get: [request, verify, save]

{buildz-0.6.14/buildz/auto/test → buildz-0.6.16/buildz/auto/test/data}/item2.js

@@ -8,7 +8,7 @@ data: {
 }
 verify: [
     "status_code, 200"
-    "result_headers.Content-Type, text/html"
+    "result_headers.Content-Type, 'text/html; charset=utf-8'"
 ]
 save: {
     test2.headers.content_type: result_headers.Content-Type

{buildz-0.6.14/buildz/auto/test → buildz-0.6.16/buildz/auto/test/data}/test.js

@@ -1,4 +1,4 @@
-configs: config.js
+configs: config/config.js
 datas: [
     //写一个配置
     {

{buildz-0.6.14 → buildz-0.6.16}/buildz/auto/test/test.py

@@ -16,8 +16,9 @@ class Req(Base):
 
 pass
 from buildz.auto import Run
+import sys
 def test():
-    Run()("test.js")
+    Run()("data/test")
 
 pass
 pyz.lc(locals(), test)

buildz-0.6.16/buildz/html/test/demo.html

@@ -0,0 +1,2 @@
+<html>
+</html>

{buildz-0.6.14 → buildz-0.6.16}/buildz/html/test/test.py

@@ -1,7 +1,6 @@
 
 from buildz.html import parse
 from buildz.tools import *
-#demo.html太大，已经删除
 fp = "demo.html"
 s = fz.read(fp, "rb").decode("utf-8")
 

{buildz-0.6.14 → buildz-0.6.16}/buildz/html/xml.py

@@ -48,6 +48,8 @@ class HtmlTag:
         else:
             tp = "="
             v = pt
+        if val is None and tp!="eval":
+            return False
         if tp == '>':
             return val>v
         elif tp == "<":

{buildz-0.6.14 → buildz-0.6.16/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.14
+Version: 0.6.16
 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
@@ -33,6 +33,7 @@ License-File: LICENSE
 持续更新中。。。
 2024/09/25:
 修复bug，增强html的搜索功能，增强auto配置功能
+auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
 2024/09/24:
 增加模块html:html页面解析
 增加模块auto:自动化调用

{buildz-0.6.14 → buildz-0.6.16}/buildz.egg-info/SOURCES.txt

@@ -25,12 +25,12 @@ buildz/auto/request.py
 buildz/auto/run.py
 buildz/auto/save.py
 buildz/auto/verify.py
-buildz/auto/test/cache.js
-buildz/auto/test/config.js
-buildz/auto/test/item1.js
-buildz/auto/test/item2.js
-buildz/auto/test/test.js
 buildz/auto/test/test.py
+buildz/auto/test/cache/cache.js
+buildz/auto/test/config/config.js
+buildz/auto/test/data/item1.js
+buildz/auto/test/data/item2.js
+buildz/auto/test/data/test.js
 buildz/db/__main__.py
 buildz/db/install.txt
 buildz/db/run.conf
@@ -68,6 +68,7 @@ buildz/fz/fio.py
 buildz/fz/lsf.py
 buildz/html/__init__.py
 buildz/html/xml.py
+buildz/html/test/demo.html
 buildz/html/test/test.py
 buildz/ioc/__init__.py
 buildz/ioc/base.py

{buildz-0.6.14 → buildz-0.6.16}/setup.py

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

buildz-0.6.14/buildz/auto/run.py

@@ -1,24 +0,0 @@
-from .. import xf
-from .. import ioc
-from ..base import Base
-from . import init
-import os
-class Run(Base):
-    def init(self, fps=None):
-        mg = ioc.build()
-        if fps is not None:
-            mg.add_fps(fps)
-        self.mg = mg
-    def call(self, fp):
-        maps = xf.loadf(fp)
-        config = self.mg.get("buildz.auto.config.load")
-        if not config(maps, fp):
-            return
-        calls = xf.g(maps, calls = [])
-        for deal in calls:
-            fc = self.mg.get(deal)
-            if not fc(maps, fp):
-                break
-
-pass
-